+ + +

+ + + + + + + + + + + + + + + + + + + + + +

$projectname + $projectnumber +

$projectbrief

$searchbox

+ + diff --git a/extras/BLOCKS/doxygen/images/BlocksDrawing_canvas.JPG b/extras/BLOCKS/doxygen/images/BlocksDrawing_canvas.JPG new file mode 100644 index 00000000..7487c7c1 Binary files /dev/null and b/extras/BLOCKS/doxygen/images/BlocksDrawing_canvas.JPG differ diff --git a/extras/BLOCKS/doxygen/images/BlocksDrawing_palette.JPG b/extras/BLOCKS/doxygen/images/BlocksDrawing_palette.JPG new file mode 100644 index 00000000..fcfe7510 Binary files /dev/null and b/extras/BLOCKS/doxygen/images/BlocksDrawing_palette.JPG differ diff --git a/extras/BLOCKS/doxygen/images/BlocksMonitor.png b/extras/BLOCKS/doxygen/images/BlocksMonitor.png new file mode 100644 index 00000000..8caa0388 Binary files /dev/null and b/extras/BLOCKS/doxygen/images/BlocksMonitor.png differ diff --git a/extras/BLOCKS/doxygen/images/BlocksSynth_grid.JPG b/extras/BLOCKS/doxygen/images/BlocksSynth_grid.JPG new file mode 100644 index 00000000..a7626f25 Binary files /dev/null and b/extras/BLOCKS/doxygen/images/BlocksSynth_grid.JPG differ diff --git a/extras/BLOCKS/doxygen/images/BlocksSynth_waveshape.gif b/extras/BLOCKS/doxygen/images/BlocksSynth_waveshape.gif new file mode 100644 index 00000000..e472685c Binary files /dev/null and b/extras/BLOCKS/doxygen/images/BlocksSynth_waveshape.gif differ diff --git a/extras/BLOCKS/doxygen/pages/connecting_blocks.dox b/extras/BLOCKS/doxygen/pages/connecting_blocks.dox new file mode 100644 index 00000000..5299ec55 --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/connecting_blocks.dox @@ -0,0 +1,33 @@ +/** +@page connecting_blocks Connecting BLOCKS + +Lightpads can be conected to a computer either via USB or Bluetooth, and Control Blocks can be connected via Bluetooth or by snapping to an already connected Lightpad. +Both devices communicate with your computer using System Exclusive (SysEx) MIDI messages. + +@section usb USB + +To connect a Lightpad to your computer over USB, you need to insert a USB-C cable into the top of the device and connect it to a USB port on your computer. +When powered on by pressing the power button on the bottom edge, you will be able to send and receive data from the block over the USB connection. + +@section bluetooth Bluetooth + +The power button also functions as a toggle for the Bluetooth connection - when the blue light on the button is illuminated, the device is able to connect via Bluetooth and send and receive MIDI data. +Pressing this button will turn the light off and disable the Bluetooth functionality. +Currently MIDI over Bluetooth is only supported on Mac OS. + +@subsection mac_bluetooth MacOS + +To connect a BLOCKS device via Bluetooth on MacOS, follow these steps: + +- Open the "Audio Midi Setup" application (found in Applications/Utilities) +- Click on the menu item: Window -> Show MIDI Studio +- Double-click on the "Bluetooth" icon in the MIDI Studio window +- Click the "Connect" button next to the block you want to connect to +- Your device should show up in the MIDI Studio window with a Bluetooth icon and can now send and receive MIDI data over Bluetooth + +@section connecting_blocks_to_each_other Connecting BLOCKS together + +Lightpad and Control Blocks can be connected together in any number of combinations via their DNA edge connectors, sharing a common connection to your computer. +To do this, simply snap your devices together and the magnetic connectors will handle the rest. +*/ + diff --git a/extras/BLOCKS/doxygen/pages/controlling_control_buttons.dox b/extras/BLOCKS/doxygen/pages/controlling_control_buttons.dox new file mode 100644 index 00000000..63151434 --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/controlling_control_buttons.dox @@ -0,0 +1,18 @@ +/** +@page controlling_control_buttons Controlling control buttons + +In addition to sending button pressed and button released events, ControlButton objects can allow your application code to change the colour of the LED behind the corresponding physical button on a BLOCKS device. + +An array of pointers to the available %ControlButton objects can be obtained from the Block::getButtons method of a Block---see the @ref discovering_blocks section for details of how to obtain a %Block object. +Once you have a %ControlButton, the functions involving the LED are ControlButton::hasLight and ControlButton::setLightColour, which are descriptively named. +A code snippet showing how to turn all the available buttons of a %Block red is shown below. +@code{.cpp} +void setAllButtonsRed (Block& block) +{ + for (auto button : block->getButtons()) + if (button->hasLight()) + button->setLightColour (Colours::red); +} +@endcode +*/ + diff --git a/extras/BLOCKS/doxygen/pages/controlling_led_grids.dox b/extras/BLOCKS/doxygen/pages/controlling_led_grids.dox new file mode 100644 index 00000000..767f7292 --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/controlling_led_grids.dox @@ -0,0 +1,57 @@ +/** +@page controlling_led_grids Controlling LED grids + +@section basic_usage Basic usage + +An LED grid on a BLOCKS device can be controlled via an LEDGrid object, which can be obtained from the Block::getLEDGrid function of a Block---see the @ref discovering_blocks section for details of how to obtain a %Block object. + +Using an LED grid requires an LEDGrid::Program to operate the LEDs. +This program specifies some code to run on the device, and can also provide methods to be called from your application which can comminucate with the code running on the device via a block of shared memory. +The code which runs on the device must be specified using @ref the_littlefoot_language, which is described in the corresponding section. +However, for a very wide range of applications, the BitmapLEDProgram provided with the BLOCKS SDK is sufficient and you will not need to create your own. +Using a %BitmapLEDProgram to change the colour of LEDs is demonstated below. + +@code{.cpp} +// This should be called when doing the initial configuration of your application. +void setBitmapLEDProgram (Block& block) +{ + if (auto grid = block->getLEDGrid()) + grid->setProgram (new BitmapLEDProgram (*grid)); +} + +// Once a BitmapLEDProgram is loaded we can use its setLED method to change the +// colour of LEDs on the corresponding device. +void setLED (Block& block, int x, int y, Colour c) +{ + if (auto grid = block->getLEDGrid()) + if (auto program = dynamic_cast (grid->getProgram())) + program->setLED (x, y, c); +} +@endcode + +@section advanced_usage Advanced Usage + +Using a custom %LEDGrid::Program allows more precise control over the operation of the LEDs. +The code which will actually execute on the device, returned by your overriden LEDGrid::Program::getLittleFootProgram() function, must be specified in the LittleFoot language. + +@subsection the_littlefoot_language The LittleFoot Language + +A description of the LittleFoot language is contained in the SDK source code at juce_blocks_basics/littlefoot/LittleFoot Language README.txt: +@includedoc "LittleFoot Language README.txt" + +@subsection littlefoot_example A LittleFoot example + +The %BitmapLEDProgram class is a simple example of a LittleFoot program. + +%juce_blocks_basics/visualisers/juce_BitmapLEDProgram.h +@include juce_blocks_basics/visualisers/juce_BitmapLEDProgram.h + +juce_blocks_basics/visualisers/juce_BitmapLEDProgram.cpp +@include juce_blocks_basics/visualisers/juce_BitmapLEDProgram.cpp + +The repaint() method of the LittleFoot program is called at approximately 25 Hz, and each time it simply inspects the heap (the shared area of memory used to communicate between your application code and your LittleFoot program) and sets the LEDs based on the heap's content. +To update the heap, and hence the LEDS, your application code calls BitmapLEDProgram::setLED. + +A more advanced example can be found in the source code of the DrumPadGridProgram class. +*/ + diff --git a/extras/BLOCKS/doxygen/pages/controlling_led_strips.dox b/extras/BLOCKS/doxygen/pages/controlling_led_strips.dox new file mode 100644 index 00000000..48eaab5b --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/controlling_led_strips.dox @@ -0,0 +1,18 @@ +/** +@page controlling_led_strips Controlling LED strips + +Control Blocks have a strip of LEDs which can be controlled via an LEDRow object. + +A pointer to an %LEDRow object can be obtained from the Block::getLEDRow method of a Block---see the @ref discovering_blocks section for details of how to obtain a %Block object. +Once you have an %LEDRow there are a few functions that you can use to interact with the strip of LEDs on a device. +A code snippet showing how to turn the whole strip of LEDs on a %Block orange is shown below. +@code{.cpp} +void setWholeLEDRowOrange (Block& block) +{ + if (auto ledRow = block->getLEDRow()) + for (int i = 0; i < ledRow.getNumLEDs(); ++i) + ledRow.setLEDColour (i, Colours::orange); +} +@endcode +*/ + diff --git a/extras/BLOCKS/doxygen/pages/discovering_blocks.dox b/extras/BLOCKS/doxygen/pages/discovering_blocks.dox new file mode 100644 index 00000000..acc12f77 --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/discovering_blocks.dox @@ -0,0 +1,56 @@ +/** +@page discovering_blocks Discovering BLOCKS + +Any BLOCKS application would be pretty limited without the ability to discover the BLOCKS that are connected to your computer. +This page gives an overview of the classes and methods available to aid BLOCKS discovery and provides sample code for getting notifications of any connections or disconnections. + +@section the_block_topology_object The BlockTopology object + +Groups of connected Lightpad and Control Blocks are described by a BlockTopology. + +A %BlockTopology contains an array of references to Block objects, which provide access to Lightpad and Control %Block functionality, and an array of BlockDeviceConnection objects, which describe the connections between devices. +Once you have a %BlockTopology you have all the information required to visualise and interact with your Lightpads and Control Blocks. +For more information about using %Block objects see the @ref the_block_object section. + +For Lightpads and Control Blocks a %BlockTopology can be obtained from a PhysicalTopologySource. + +@section the_physical_topology_source_object The PhysicalTopologySource object + +The current topology is provided by a %PhysicalTopologySource. +When instantiated, a %PhysicalTopologySource monitors for any connections from your computer to any Lightpad and Control Blocks and the PhysicalTopologySource::getCurrentTopology() method returns the current %BlockTopology. + +In an environment where Lightpad and Control can be connected and disconnected dynamically it is convenient to register your code for topologyChanged() callbacks from a %PhysicalTopologySource. +Then, when the current %BlockTopology changes, your application is able to react to the new configuration. +You can do this by inheriting from the TopologySource::Listener class and registering as a listener to a %PhysicalTopologySource object. +When you inherit from %TopologySource::Listener you must override the pure virtual method TopologySource::Listener::topologyChanged(), which is then called by a %PhysicalTopologySource on topology changes when you register as a listener. +A simple example is shown below. + +BlockFinder.h: +@include BlockFinder/BlockFinder.h + +BlockFinder.cpp: +@include BlockFinder/BlockFinder.cpp + +When instantiated this class simply monitors for changes to the connected Lightpad and Control Blocks and prints some information about them to stdout. +Once you have the current %BlockTopology object you have access to the available %Block objects and can start to interact with them. +A more complex application would probably do much more in the topologyChanged() method---see the @ref example_applications page. + +@section the_block_object The Block object + +A Block object is the main entry point for communicating between your application and any Lightpad and Control Blocks that are connected to your computer. + +All the different %Block types are subclasses of %Block so they provide the same interface (see the %Block class documentation). +About half of the %Block public member functions return information about the physical device it represents. +In the example code above you can see that we use some of these methods to query each %Block about its current status. +The more interesting %Block methods return pointers to objects you can use to control and receive events from individual BLOCKS. +More detail about these methods can be obtained from the following pages: + +@ref getting_touch_events + +@ref getting_control_button_events + +@ref controlling_led_grids + +@ref controlling_led_strips +*/ + diff --git a/extras/BLOCKS/doxygen/pages/downloading_the_sdk.dox b/extras/BLOCKS/doxygen/pages/downloading_the_sdk.dox new file mode 100644 index 00000000..52e37e47 --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/downloading_the_sdk.dox @@ -0,0 +1,12 @@ +/** +@page downloading_the_sdk Downloading the SDK + +The BLOCKS SDK is distributed as part of the JUCE framework, which can be obtained from GitHub here. +The JUCE repository also contains the code for the @ref example_applications, which require the JUCE framework to compile. +Whilst you don't need to know anything about JUCE to build the examples using the supplied Visual Studio/Xcode/etc projects, it will probably be worthwhile reading a brief introduction to JUCE, which can be found here. + +You can also download the standalone BLOCKS SDK from GitHub here. +This is a stripped down version of what JUCE provides, including only the features required for the SDK. +Using this version of the SDK is much more complicated but may be more suitable for integrating BLOCKS into an existing application. +More details are provided in the @ref the_standalone_blocks_sdk section. +*/ diff --git a/extras/BLOCKS/doxygen/pages/example_applications.dox b/extras/BLOCKS/doxygen/pages/example_applications.dox new file mode 100644 index 00000000..068dfe4d --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/example_applications.dox @@ -0,0 +1,30 @@ +/** +@page example_applications Example Applications + +@section downloading_the_example_code Downloading the example code + +These example applications demonstrate the functionality of the BLOCKS SDK. + +The example applications are all distributed as part of the JUCE framework, which can be obtained from GitHub here. +You will find the examples in the JUCE/examples/BLOCKS/ directory. +Each example comes with projects for Visual Studio, Xcode, etc in the Builds subdirectory or each example directory, and these should open, compile and run without any trouble in the respective IDEs. + +A quick guide to getting up and running with JUCE can be found here. + +

Overview

+ +@subpage example_blocks_monitor + +BlocksMonitor is a simple JUCE application that shows currently connected Lightpad and Control %Block devices and visualises touches and button presses. +It also displays some basic information about the Blocks. + +@subpage example_blocks_drawing + +BlocksDrawing is a JUCE application that allows you to use your Lightpad as a drawing surface. +You can choose from a palette of 9 base colours and paint them on the 15x15 LED grid, blending between colours using touch pressure. + +@subpage example_blocks_synth + +BlocksSynth is a JUCE application that turns your Lightpad into a simple monophonic synthesiser capable of playing 4 different waveshapes - sine, square, sawtooth and triangle. +*/ + diff --git a/extras/BLOCKS/doxygen/pages/example_blocks_drawing.dox b/extras/BLOCKS/doxygen/pages/example_blocks_drawing.dox new file mode 100644 index 00000000..f26cb220 --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/example_blocks_drawing.dox @@ -0,0 +1,35 @@ +/** +@page example_blocks_drawing BlocksDrawing + +In order to compile and run this application you need to first download the JUCE framework, which can be obtained from GitHub here. + +@section blocks_drawing_introduction Introduction + +BlocksDrawing is a JUCE application that allows you to use your Lightpad as a drawing surface. You can choose from a palette of 9 base colours and paint them on the 15x15 LED grid, blending between colours using touch pressure. + +Navigate to the JUCE/examples/BLOCKS/BlocksDrawing/Builds/ directory and open the code project in your IDE of choice. Run the application and connect your Lightpad (if you do not know how to do this, see @ref connecting_blocks) - it should now display a 3x3 grid of colours to choose from. Touch a colour to set it as the current brush colour and then press the mode button to switch to canvas mode where you will be presented with a blank touch surface. Touch anywhere on the LED grid to start painting and use the pressure of your touch to control how bright the colour is. Try painting over an already painted LED to increase its brightness and blend between different colours by doing this with a different brush colour. To clear the canvas and start over, double-click the mode button. + +The concept of a BLOCKS topology and the methods for receiving callbacks from a Block object are covered in the @ref example_blocks_monitor example and this tutorial will cover the methods in the API for displaying grids and setting LEDs on the Lightpad. + +@section blocks_drawing_led_grid The LEDGrid Object + +Lightpads have a 15x15 LED grid which can be accessed and controlled through the LEDGrid object, a pointer to which is returned by the Block::getLEDGrid() method (for more details on how the %LEDGrid object operates, see @ref controlling_led_grids). In the topologyChanged() method of MainComponent this %LEDGrid pointer is passed to the setLEDProgram() method, which sets the LEDGrid::Program to either a DrumPadGridProgram or BitmapLEDProgram, depending on the selected mode. + +@section blocks_drawing_colour_palette Colour Palette + +In the colour palette mode the Lightpad displays a 3x3 grid of colours, constructed using the %DrumPadGridProgram class. A %DrumPadGridProgram pointer called colourPaletteProgram is declared as a private member variable of MainComponent and in the MainComponent::setLEDProgram() method this is set to point to a new %DrumPadGridProgram object and is passed the %LEDGrid object of the Lightpad in its constructor. After the program has been initialised, it is passed to the LEDGrid to display using the LEDGrid::setProgram() method and the layout of the grid is set up using the DrumPadGridProgram::setGridFills() method. This function takes 3 arguments: the number of rows, number of columns and an array of DrumPadGridProgram::GridFill objects containing a GridFill for each pad that controls its colour and fill type. The ColourGrid struct in MainComponent.h contains all of this information and handles the construction of the GridFill array in the ColourGrid::constructGridFillArray() method. An instance of this object called layout is declared as a member variable of MainComponent to easily change how the grid looks. The ColourGrid::setActiveColourForTouch() method is called in the MainComponent::touchChanged() callback and is used to determine which brush colour has been selected based on a Touch coordinate from the Lightpad. + +\image html BlocksDrawing_palette.JPG "Colour palette mode" + +@section blocks_drawing_canvas Canvas + +In canvas mode, the %LEDGrid program is set to an instance of %BitmapLEDProgram and uses the BitmapLEDProgram::setLED() method to set individual LEDs on the Lightpad to a particular colour. The ActiveLED struct declared in the private section of MainComponent is used to keep track of which LEDs are on and their colour and brightness. MainComponent contains an %Array of these objects called activeLeds. +In the MainComponent::setLEDProgram() method the program is set up and passed to the %LEDGrid object the same way as in the colour palette mode but the MainComponent::redrawLEDs() method is also called which iterates over the activeLeds array and sets the appropriate LEDs on the Lightpad so the LED states persist between mode switches. When a Touch is received in the MainComponent::touchChanged() callback the MainComponent::drawLEDs() method is called with 4 arguments: x and y coordinates, touch pressure and brush colour. This method iterates over the activeLed array and checks to see if there is an active LED at the given coordinate. If it is blank, an ActiveLED object is created and added to the array with the given coordinates and colour using touch pressure for brightness. If there is already an active LED at the coordinate, the colour of that LED will be blended with the current brush colour, the proportion of which is determined by the touch pressure. + +\image html BlocksDrawing_canvas.JPG "Unleash your inner Picasso!" + +@section blocks_drawing_summary Summary + +This tutorial and the accompanying code project have introduced the %LEDGrid object and shown how to use the %LEDGrid::Program object to display basic grids and set individual LEDs on the Lightpad. + +*/ diff --git a/extras/BLOCKS/doxygen/pages/example_blocks_monitor.dox b/extras/BLOCKS/doxygen/pages/example_blocks_monitor.dox new file mode 100644 index 00000000..405a7258 --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/example_blocks_monitor.dox @@ -0,0 +1,34 @@ +/** +@page example_blocks_monitor BlocksMonitor + +In order to compile and run this application you need to first download the JUCE framework, which can be obtained from GitHub here. + +@section blocks_monitor_introduction Introduction + +BlocksMonitor is a simple JUCE application that shows currently connected Lightpad and Control %Block devices and visualises touches and button presses. It also displays some basic information about the Blocks. + +Navigate to the JUCE/examples/BLOCKS/BlocksMonitor/Builds/ directory and open the code project in your IDE of choice. Run the application and connect your Blocks (if you do not know how to do this, see @ref connecting_blocks). Any devices that you have connected should now show up in the application window and this display will be updated as you add and remove Blocks. Lightpads are represented as a black square and will display the current touches as coloured circles, the size of which depend on the touch pressure, and Control Blocks are shown as rectangles containing the LED row and clickable buttons on the hardware. If you hover the mouse cursor over a %Block, a tooltip will appear displaying the name, UID, serial number and current battery level. + +\image html BlocksMonitor.png "The BlocksMonitor application with a Lightpad and Control Block connected" + +@section blocks_monitor_topology Topology + +One of the fundamental concepts of the BLOCKS API is topology - a topology is a set of physically connected Blocks and the connections between them. Knowing when the topology has changed and accessing a data structure containing the current topology is the basis of any Blocks application. + +To access the current topology, MainComponent inherits from the TopologySource::Listener base class and implements the TopologySource::Listener::topologyChanged() method, a callback which is used to inform listeners when any physical devices have been added or removed. In order to receive these callbacks, MainComponent contains an instance of the PhysicalTopologySource class and registers itself as a listener to this object in its constructor. When the topologyChanged() method is called, this object can be used to access the updated topology through the PhysicalTopologySource::getCurrentTopology() method which returns a BlockTopology struct containing an array of currently connected Block objects and an array of BlockDeviceConnection structs representing the connections between them. + +@section blocks_monitor_block_object The Block Object + +The array of %Block objects contained in the %BlockTopology struct can be used to access individual %Block objects and determine their type using the Block::getType() method. The application uses this information to construct an on-screen representation of the currently connected Blocks by creating either a LightpadComponent or ControlBlockComponent object for each %Block in the current topology. Both of these classes derive from BlockComponent, a relatively simple base class that contains some virtual functions for painting the %Block on screen and handling callbacks from the touch surface and/or buttons on the %Block. In its constructor, BlockComponent takes a reference to the %Block object that it represents and adds itself as a listener to the touch surface (if it is a Lightpad) and buttons using the Block::getTouchSurface() and Block::getButtons() methods, respectively. It inherits from the TouchSurface::Listener and ControlButton::Listener classes and overrides the TouchSurface::Listener::touchChanged(), ControlButton::Listener::buttonPressed() and ControlButton::Listener::buttonReleased() methods to call its own virtual methods, which are implemented by the LightpadComponent and ControlBlockComponent classes to update the on-screen components. + +To visualise touches on the Lightpad, LightpadComponent contains an instance of the TouchList class called touches and calls the TouchList::updateTouch() method whenever it receives a touch surface listener callback in the LightpadComponent::handleTouchChange() method. The LightpadBlock::paint() method then iterates over the current TouchSurface::Touch objects in the %TouchList and visualises them on the component at 25Hz. + +The ControlBlockComponent class represents a generic Control %Block with 15 LEDs, 8 circular buttons and 1 rounded rectangular button. When a button is pressed on the physical Control %Block, the BlockComponent::handleButtonPressed() function is called and this class uses the ControlButton::ButtonFunction variable to determine which button was pressed and should be activated on the on-screen component. The same process is repeated for when the button is released. This class also overrides the BlockComponent::handleBatteryLevelUpdate() method to update which LEDs should be on based on the battery level, which is accessed in the BlockComponent base class using the Block::getBatteryLevel() and Block::isBatteryCharging() methods. + +These callback methods are a simple and powerful way to get user input from the Blocks and use this data to drive some process in your application. In this example, the input is simply mirrored on the screen but it could be used to control any number of things such as audio synthesis (see the @ref example_blocks_synth example) and graphics (see the @ref example_blocks_drawing example). + +@section blocks_monitor_summary Summary + +This tutorial and the accompanying code has introduced the %BlockTopology and %Block objects, and demonstrated how to receive callbacks from connected Blocks when the touch surface or buttons are pressed, allowing you to use this input in your own applications. +*/ + diff --git a/extras/BLOCKS/doxygen/pages/example_blocks_synth.dox b/extras/BLOCKS/doxygen/pages/example_blocks_synth.dox new file mode 100644 index 00000000..cd6934e0 --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/example_blocks_synth.dox @@ -0,0 +1,35 @@ +/** +@page example_blocks_synth BlocksSynth + +In order to compile and run this application you need to first download the JUCE framework, which can be obtained from GitHub here. + +@section blocks_synth_introduction Introduction + +BlocksSynth is a JUCE application that turns your Lightpad into a simple monophonic synthesiser capable of playing 4 different waveshapes - sine, square, sawtooth and triangle. + +Navigate to the JUCE/examples/BLOCKS/BlocksSynth/Builds/ directory and open the code project in your IDE of choice. Run the application and connect your Lightpad (if you do not know how to do this, see @ref connecting_blocks) - it should now display a simple 5x5 grid where each pad plays a note in the chromatic scale using a sine wave starting from the bottom-left (C3). It is possible to play any of the 25 notes but for ease of use tonics (the root note of the scale) are highlighted in white and notes in the C-major scale are highlighted in green. When a note has been played it is possible to change the amplitude using touch pressure and to pitch bend between adjacent notes by sliding left and right. Pressing the mode button on the Lightpad will change to the waveshape selection screen where the currently selected waveshape is rendered on the LEDs and you can switch between the 4 different waveshapes by touching anywhere on the %Block surface. + +The concept of a BLOCKS topology and the methods for receiving callbacks from the Block object are covered in the @ref example_blocks_monitor example and the basic methods for displaying grids and setting LEDs on the %Block are covered in the @ref example_blocks_drawing example. This example will cover how to render more complex displays on the LEDGrid and how to do some simple audio synthesis using data from the Lightpad. + +@section blocks_synth_note_grid Note Grid + +In the synthesiser mode the Lightpad displays a 5x5 grid constructed using the DrumPadGridProgram class. The SynthGrid struct in MainComponent.h handles the setup and layout of this grid and sets the colours of the pads to white for tonics, green for notes in the C major scale and black for notes that are not in the C major scale. The ColourGrid::getNoteNumberForPad() method is called in the MainComponent::touchChanged() callback and returns the corresponding MIDI note number for a Touch coordinate on the Lightpad. This note number is then passed to the Audio class to be played on the synthesiser. + +\image html BlocksSynth_grid.JPG "Synthesiser note grid" + +@section blocks_synth_waveshape_display Waveshape Display + +In the waveshape selection mode the LEDGrid::Program is set to an instance of BitmapLEDProgram and uses a Timer to draw moving waveshapes onto the LEDs of the Lightpad. In the constructor of MainComponent the MainComponent::generateWaveshapes() method is called - this function generates 45 Y coordinates scaled and offset to fit the LED grid of the Lightpad for each of the 4 waveshapes and stores them in 4 separate arrays: sineWaveY, squareWaveY, sawWaveY and triangleWaveY. Then in the MainComponent::timerCallback() method, a for loop iterates over the 15 LEDs on the X-axis and draws an LED 'circle' using the MainComponent::drawLEDCircle() method at the corresponding Y coordinate for the selected waveshape. The read position of the array is offset using the yOffset variable which is incremented each timer callback and wraps back around when the end of the array is reached to draw a 'moving' waveshape. + +\image html BlocksSynth_waveshape.gif "A sine wave dispayed in the waveshape selection mode" + +@section blocks_synth_audio Audio + +The Audio class handles the audio synthesis for this application and overrides the AudioIODeviceCallback::audioDeviceIOCallback() method to call the Synthesiser::renderNextBlock() method of a Synthesiser object. This object is initialised to be capable of rendering sine, square, sawtooth and triangle waves on separate MIDI channels in the constructor of Audio, and Audio contains methods for sending note on, note off, channel pressure and pitch wheel messages to the Synthesiser. When a note is triggered on the Lightpad, the Audio::noteOn() method is called with 3 arguments: a MIDI channel corresponding to the waveshape that should be generated, a MIDI note number and an initial velocity. Whilst the note is playing, the amplitude and pitch are modulated by calling the Audio::pressureChange() and Audio::pitchChange() methods from the MainComponent::touchChanged() callback. The pressure value of the Touch instance is used to directly control the Synthesiser amplitude and the distance from the initial note trigger on the X-axis of the Lightpad is scaled to +/-1.0 and used to modulate the frequency of the currently playing note. +The Oscillators.h file contains the waveshape rendering code. It contains an Oscillator base class which inherits from SynthesiserVoice and has a pure virtual Oscillator::renderWaveShape() method that is overridden by subclasses to render the 4 different waveshapes. + +@section blocks_synth_summary Summary + +This tutorial and the accompanying code project have expanded on the topics covered by previous tutorials, showing you how to display more complex programs on the %LEDGrid and how to control simple audio synthesis parameters using the Lightpad. + +*/ diff --git a/extras/BLOCKS/doxygen/pages/getting_control_button_events.dox b/extras/BLOCKS/doxygen/pages/getting_control_button_events.dox new file mode 100644 index 00000000..32e59a3e --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/getting_control_button_events.dox @@ -0,0 +1,40 @@ +/** +@page getting_control_button_events Getting control button events + +Control button events are communicated from Lightpad and Control Blocks to your application via ControlButton objects. + +You can obtain an array of %ControlButton pointers associated with a specific Lightpad or Control %Block from its corresponding Block object using the Block::getButtons method---see the @ref discovering_blocks page for an example of how to obtain %Block objects. +Each pointer to a %ControlButton will be valid for the lifetime of the %Block object. + +Once you have a %ControlButton you must register as a ControlButton::Listener to receive button pressed and button released callbacks. +The process for doing this is to have one of your application's classes inherit from %ControlButton::Listener and override the pure virtual methods ControlButton::Listener::buttonPressed and ControlButton::Listener::buttonReleased. +Then, when you register your derived class as a listener to a particular %ControlButton, your overriden methods will be called when the corresponding button is pressed and released. + +Registering a class derived from %ControlButton::Listener with multiple %ControlButton objects is done as follows: +@code{.cpp} +class ControlButtonListenerExample : public ControlButton::Listener +{ +public: + ControlButtonListenerExample (Block& block) + { + for (auto button : block->getButtons()) + button->addListener (this); + } + + virtual void buttonPressed (ControlButton&, sourceControlButton, Block::Timestamp timestamp) override + { + // Do something when the sourceControlButton is pressed! + } + + virtual void buttonReleased (ControlButton&, sourceControlButton, Block::Timestamp timestamp) override + { + // Do something when the sourceControlButton is released! + } +}; +@endcode + +When your overriden buttonPressed or buttonReleased methods are called you have access to two paramters: a reference to the %ControlButton that generated this event and timestamp for the event. + +You will find multiple examples of control button listeners in the @ref example_applications pages. +*/ + diff --git a/extras/BLOCKS/doxygen/pages/getting_touch_events.dox b/extras/BLOCKS/doxygen/pages/getting_touch_events.dox new file mode 100644 index 00000000..75e25f1c --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/getting_touch_events.dox @@ -0,0 +1,36 @@ +/** +@page getting_touch_events Getting touch events + +Touch events are communicated from BLOCKS devices to your application code via TouchSurface objects. + +You can obtain a pointer to the %TouchSurface associated with a specific BLOCKS device from its corresponding Block object using the Block::getTouchSurface() method---see the @ref discovering_blocks page for an example of how to obtain %Block objects. +For devices without a touch surface (such as the Control Block) this method will return nullptr, but if the device is capable of sending touch events then the pointer to the %TouchSurface will be valid for the lifetime of the %Block object. + +Once you have a %TouchSurface you must register as a TouchSurface::Listener to get touch events. +The process for doing this is to have one of your application's classes inherit from %TouchSurface::Listener and override the pure virtual method TouchSurface::Listener::touchChanged. +Then, when you register your derived class as a listener to a particular %TouchSurface, your overriden method will be called when the corresponding device is touched. + +A safe way of registering a class derived from %TouchSurface::Listener with a %TouchSurface is as follows. +@code{.cpp} +class TouchSurfaceListenerExample : public TouchSurface::Listener +{ +public: + TouchSurfaceListenerExample (Block& block) + { + if (auto touchSurface = block->getTouchSurface()) + touchSurface->addListener (this); + } + + virtual void touchChanged (TouchSurface& sourceTouchSurface, const TouchSurface::Touch& touchEvent) override + { + // Do something with touchEvent here! + } +}; +@endcode + +When your overriden touchChanged method is called you have access to two paramters: a reference to the %TouchSurface that generated this event and a reference to a TouchSurface::Touch. +The %TouchSurface::Touch class contains member variables describing the postion, pressure, velocity, timestamp and more. + +You will find multiple examples of using TouchSurfaces in the @ref example_applications pages. +*/ + diff --git a/extras/BLOCKS/doxygen/pages/main.dox b/extras/BLOCKS/doxygen/pages/main.dox new file mode 100644 index 00000000..512c6a4b --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/main.dox @@ -0,0 +1,58 @@ +/** +@mainpage Documentation + +Welcome to the BLOCKS SDK documentation. +
+ +Here you will find all the information required to start creating BLOCKS applications. +A brief summary of the main sections is below. + +
+@subpage downloading_the_sdk + +This section describes how to obtain the SDK source code, either via the JUCE framework or @ref the_standalone_blocks_sdk. + +
+@subpage connecting_blocks + +Lightpad and Control Blocks communicate with a computer over USB-C or Bluetooth, and communicate with each other via magnetic connections on their sides. +This section contains instructions for configuring your setup so that all the components can communicate with each other. + +
+@subpage discovering_blocks + +Once you have connected your device to your computer you need to be able to discover it from your application. +This section outlines the procedure for Lightpad and Control %Block discovery and provides some simple example code which monitors for new connections. + +
+@subpage getting_touch_events + +This section explains how to capture touch events from a compatible device and, building on the @ref discovering_blocks section, displays some example code. + +
+@subpage getting_control_button_events + +Lightpad and Control Blocks have control buttons, either a mode button on their side or labelled buttons on top, and this section shows you how to obtain button pressed and button released events. + +
+@subpage controlling_led_grids + +This section explains how to control the LED grid on a Lightpad. + +
+@subpage controlling_led_strips + +Control Blocks have a strip of lights running along one side and this section provides instructions for controling the individual LEDs. + +
+@subpage controlling_control_buttons + +As well as providing button pressed and button released events, control buttons also have LEDs. +This section explains how to change the colour of different buttons. + +
+@subpage the_standalone_blocks_sdk + +The easiest way to get started using the SDK is via the JUCE framework, but if you want to integrate BLOCKS functionality into your existing application then it may be more convenient to use @ref the_standalone_blocks_sdk. +This section gives an overview of building and using the BLOCKS SDK as a library. +*/ diff --git a/extras/BLOCKS/doxygen/pages/the_standalone_blocks_sdk.dox b/extras/BLOCKS/doxygen/pages/the_standalone_blocks_sdk.dox new file mode 100644 index 00000000..248150b9 --- /dev/null +++ b/extras/BLOCKS/doxygen/pages/the_standalone_blocks_sdk.dox @@ -0,0 +1,68 @@ +/** +@page the_standalone_blocks_sdk The standalone BLOCKS SDK + +The easiest way to get started developing BLOCKS applications is to use the JUCE framework, but if you would prefer not to use JUCE directly the standalone BLOCKS SDK can be obtained from the BLOCKS-SDK repository. + +The most straightforward way to use the SDK is to compile the SDK source code into a static library. +Then, in your BLOCKS application code, you can use the header files in the SDK to give you access to the BLOCKS classes and functions. +Finally, when you want to compile your application, you must link against the static library to get all the BLOCKS functionality. + +@section standalone_building_library Building the SDK library + +The source code for the BLOCKS SDK library is contained within the SDK directory of the BLOCKS-SDK repository. +Here you will find a header file that you can include in your own projects and the Build directory contains an XCode project, a Visual Studio project and a Linux Makefile for compiling the SDK source code into a static library. +Open the appropriate project for your platform, select either the "Debug" or "Release" configuration, and build the project. +For MacOS and Linux this will produce libBLOCKS-SDK.a in either a Debug/ or Release/ directory, and for Windows this will produce BLOCKS-SDK.lib in x64/Debug/ or x64/Release/. + +@section standalone_using_header Using the SDK header file + +To use BLOCKS classes and functions in your application you must include the BlocksHeader.h file in your source code. +You must also tell the compiler to look in the SDK/ directory for additional header files, which you can configure inside your XCode or Visual Studio project. +If you are using the command line to compile your application then you can see an example of how to do this in examples/BLOCKS-SDK/BlockFinder/Linux/Makefile (which is also appropriate for MacOS, despite being located inside the Linux directory). + +@section standalone_linking Linking against the SDK library + +You must also tell your compiler where to find the SDK static library before your BLOCKS application will compile, and include all of the dependencies for your platform, which are listed in the @ref standalone_dependencies section. +Again, this is configured in your XCode or Visual Studio project, but if you are using the command line you can see an example of how to do this in examples/BLOCKS-SDK/BlockFinder/Linux/Makefile (which, again, is also appropriate for MacOS). + +@section standalone_example An example application + +The source code for this example can be found in the BLOCKS-SDK repository at examples/BlockFinder/, with the parts that are specific to different operating systems in the corresonding subdirectories. + +The main functionality of the application is contained within the following class: + +BlockFinder/BlockFinder.h: +@include BlockFinder/BlockFinder.h + +BlockFinder/BlockFinder.cpp: +@include BlockFinder/BlockFinder.cpp + +All this class does is create a PhysicalTopologySource and register for TopologySource::Listener::topologyChanged() callbacks---for more information about how this works you should see the @ref discovering_blocks section. +When the topology changes we print some information about the available BLOCKS. + +The main function of the MacOS application is the easiest to understand. + +BlockFinder/MacOS/main.mm: +@include BlockFinder/MacOS/main.mm + +Here we simply perform some JUCE initialisation, instantiate a BlockFinder class, then run the event loop. +Whilst in the event loop, the finder object receives TopologySource::Listener::topologyChanged() callbacks and we see output printed to stdout when BLOCKS are connected or disconnected. + +@section standalone_dependencies Standalone SDK dependencies + +- A C++11 compatible compiler + +@subsection standalone_libraries_macos MacOS frameworks + +- Accelerate +- AudioToolbox +- CoreAudio +- CoreMIDI + +@subsection standalone_libraries_linux Linux packages + +- x11 +- alsa +- libcurl +*/ + diff --git a/extras/BLOCKS/doxygen/process_source_files.py b/extras/BLOCKS/doxygen/process_source_files.py new file mode 100644 index 00000000..bc905168 --- /dev/null +++ b/extras/BLOCKS/doxygen/process_source_files.py @@ -0,0 +1,164 @@ +import os +import shutil +import re + + +def get_curly_brace_scope_end(string, start_pos): + """Given a string and the position of an opening curly brace, find the + position of the closing brace. + """ + if string[start_pos] != "{": + raise ValueError("string must have \"{\" at start pos") + string_end = len(string) + bracket_counter = 1 + start_pos += 1 + while start_pos < string_end: + if string[start_pos] == "{": + bracket_counter += 1 + elif string[start_pos] == "}": + bracket_counter -= 1 + if bracket_counter == 0: + return start_pos + start_pos += 1 + return -1 + + +def add_doxygen_group(path, group_name): + """Add a Doxygen group to the file at 'path'. + + Namespaces cause all kinds of problems, and we need to ensure that if + the classes in a source file are contained within a namespace then we + also put the @weakgroup inside. + """ + filename = os.path.basename(path) + if filename.startswith("juce_") and filename.endswith(".h"): + + group_definition_start = ("\n/** @weakgroup " + + group_name + + "\n * @{\n */\n") + group_definition_end = "\n/** @}*/\n" + + with open(path, "r") as f: + content = f.read() + + # Put the group definitions inside all namespaces. + namespace_regex = re.compile(r"\s+namespace\s+\S+\s+{") + match = namespace_regex.search(content) + while (match is not None): + namespace_end = get_curly_brace_scope_end(content, match.end() - 1) + if namespace_end == -1: + raise ValueError("error finding end of namespace " + + match.group() + + " in " + + path) + content = (content[:match.end()] + + group_definition_start + + content[match.end():namespace_end] + + group_definition_end + + content[namespace_end:]) + search_start = (namespace_end + + len(group_definition_start) + + len(group_definition_end)) + + match = namespace_regex.search(content, search_start) + + with open(path, "w") as f: + f.write(group_definition_start) + f.write(content) + f.write(group_definition_end) + + +############################################################################### + +# Get the list of JUCE modules to include. +juce_modules = [] +with open("../juce_modules.txt", "r") as f: + for line in f: + juce_modules.append(line.strip()) + +# A temporary directory to hold our preprocessed source files. +build_directory = "build" + +# Make sure we have a clean temporary directory. +try: + shutil.rmtree(build_directory) +except OSError as e: + if e.errno != 2: + # An errno of 2 indicates that the directory does not exist, which is + # fine! + raise e + +# Copy the JUCE modules to the temporary directory, and process the source +# files. +module_definitions = [] +for module_name in juce_modules: + + # Copy the required modules. + original_module_dir = os.path.join("..", "..", "..", "modules", module_name) + module_path = os.path.join(build_directory, module_name) + shutil.copytree(original_module_dir, module_path) + + # Parse the module header to get module information. + module_header = os.path.join(module_path, module_name + ".h") + with open (module_header, "r") as f: + content = f.read() + block_info_result = re.match(r".*BEGIN_JUCE_MODULE_DECLARATION" + "(.*)" + "END_JUCE_MODULE_DECLARATION.*", + content, + re.DOTALL) + detail_lines = [] + for line in block_info_result.group(1).split("\n"): + stripped_line = line.strip() + if stripped_line: + result = re.match(r"^.*?description:\s*(.*)$", stripped_line) + if result: + short_description = result.group(1) + else: + detail_lines.append(stripped_line) + + # The module header causes problems for Doxygen, so delete it. + os.remove(module_header) + + # Create a Doxygen group definition for the module. + module_definiton = [] + module_definiton.append("/** @defgroup {n} {n}".format(n=module_name)) + module_definiton.append(" {d}".format(d=short_description)) + module_definiton.append("") + for line in detail_lines: + module_definiton.append(" - {l}".format(l=line)) + module_definiton.append("") + module_definiton.append(" @{") + module_definiton.append("*/") + + # Create a list of internal directories we can use as subgroups and create + # the Doxygen group hierarchy string. + dir_contents = os.listdir(module_path) + subdirs = [x for x in dir_contents + if os.path.isdir(os.path.join(module_path, x))] + module_groups = {} + for subdir in subdirs: + subgroup_name = "{n}-{s}".format(n=module_name, s=subdir) + module_groups[subgroup_name] = os.path.join(module_path, subdir) + module_definiton.append("") + module_definiton.append( + "/** @defgroup {tag} {n} */".format(tag=subgroup_name, n=subdir) + ) + module_definiton.append("") + module_definiton.append("/** @} */") + + module_definitions.append("\n".join(module_definiton)) + + # Put the top level files into the main group. + for filename in (set(dir_contents) - set(subdirs)): + add_doxygen_group(os.path.join(module_path, filename), module_name) + + # Put subdirectory files into their respective groups. + for group_name in module_groups: + for dirpath, dirnames, filenames in os.walk(module_groups[group_name]): + for filename in filenames: + add_doxygen_group(os.path.join(dirpath, filename), group_name) + +# Create an extra header file containing the module hierarchy. +with open(os.path.join(build_directory, "juce_modules.dox"), "w") as f: + f.write("\n\n".join(module_definitions)) diff --git a/extras/BLOCKS/doxygen/stylesheet.css b/extras/BLOCKS/doxygen/stylesheet.css new file mode 100644 index 00000000..125edee3 --- /dev/null +++ b/extras/BLOCKS/doxygen/stylesheet.css @@ -0,0 +1,2178 @@ +@font-face { + font-family: Contax Pro; + src: url("data:application/x-font-woff;charset=utf-8;base64,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") format("woff"); + font-weight: 400; + font-style: normal +} +@font-face { + font-family: Contax Pro; + src: url("data:application/x-font-woff;charset=utf-8;base64,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") format("woff"); + font-weight: 700; + font-style: normal +} +p { + letter-spacing: .3 +} +.center, +.center-text { + text-align: center +} +h1, +h2, +h3, +h4 { + font-weight: 400; + letter-spacing: .3 +} +.heading--bold { + font-weight: 900; + font-smoothing: antialiased +} +hr { + border-top: 2px solid #ebebeb; + margin: 20px 0 +} +.link-list { + padding-left: 0 +} +.link-list>li { + text-decoration: none; + list-style: none; + margin: 20px 0 +} +.link-list>li a { + color: #397fba +} +.headed-list { + list-style: none; + position: relative; + padding-left: 0 +} +.headed-list li { + position: relative; + margin: 0 +} +.headed-list li+li { + margin-top: 2em +} +.headed-list h5 { + font-size: 15px; + font-weight: 700; + margin: 0 +} +.headed-list p { + margin: 0 +} +.pretty { + list-style: none; + padding-left: 1em +} +.pretty li { + position: relative +} +.pretty li:before { + content: ''; + position: absolute; + display: block; + width: .3em; + height: .3em; + border-radius: 50%; + left: -1em; + background: #d1d3d3; + top: .6em +} +.pretty-ol { + padding-left: 1em +} +.pretty-ol li { + padding-left: .5em +} +.inline-link, +p a { + text-decoration: underline; + color: #4665a2 +} +a:focus, +button:active, +button:focus { + outline: none +} +.svg-icon { + vertical-align: bottom +} +.small-print>* { + font-size: 12px +} +.small-print h2, +.small-print h3, +.small-print h4, +.small-print h5 { + font-size: 14px +} +.sm { + position: relative; + z-index: 9999 +} +.sm, +.sm li, +.sm ul { + display: block; + list-style: none; + margin: 0; + padding: 0; + line-height: normal; + direction: ltr; + text-align: left; + -webkit-tap-highlight-color: transparent +} +.sm-rtl, +.sm-rtl li, +.sm-rtl ul { + direction: rtl; + text-align: right +} +.sm>li>h1, +.sm>li>h2, +.sm>li>h3, +.sm>li>h4, +.sm>li>h5, +.sm>li>h6 { + margin: 0; + padding: 0 +} +.sm ul { + display: none +} +.sm a, +.sm li { + position: relative +} +.sm a { + display: block +} +.sm a.disabled { + cursor: not-allowed +} +.sm:after { + display: block; + height: 0; + font: 0/0 serif; + clear: both; + visibility: hidden; + overflow: hidden +} +.sm, +.sm *, +.sm:after, +.sm:before { + box-sizing: border-box +} +.sm-dox { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAIAAADHFsdbAAAAcElEQVR4Ae3dTQ6DIBRF4ce70NS4uA51YOLAtFYw0B+gxn06dAddRMGykHO/5K6Ctv3LdaX4fJJ4+RXuvcA+/xkXMbsPJhugbcQ4B9xT2dF43EzAVfscExGa3rIQxGkORZaK5U9zhKKSGYFueODS6h/TSxpOsn4UagAAAABJRU5ErkJggg==) +} +.sm-dox a, +.sm-dox a:active, +.sm-dox a:focus, +.sm-dox a:hover { + padding: 0 12px; + padding-right: 43px; + font-family: Lucida Grande, Geneva, Helvetica, Arial, sans-serif; + font-size: 13px; + font-weight: 700; + line-height: 36px; + text-decoration: none; + text-shadow: 0 1px 1px hsla(0, 0%, 100%, .9); + color: #283a5d; + outline: 0 +} +.sm-dox a:hover { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAIAAADHFsdbAAAAVUlEQVR4Ae2dSwqAMBBDJ2+kKIqIW8W94CXceP8j2amt5wgJ+Z3B9vOmH1emZSMNM3QJSRkgHDMrkLz4ReN+XA9EHr0fOa/b4OiSd023v/b/fX9Z9V/qQQI0WZ7jfQAAAABJRU5ErkJggg==); + background-repeat: repeat-x; + color: #fff; + text-shadow: 0 1px 1px #000 +} +.sm-dox a.current { + color: #d23600 +} +.sm-dox a.disabled { + color: #bbb +} +.sm-dox a span.sub-arrow { + position: absolute; + top: 50%; + margin-top: -14px; + left: auto; + right: 3px; + width: 28px; + height: 28px; + overflow: hidden; + font: 700 12px/28px monospace!important; + text-align: center; + text-shadow: none; + background: hsla(0, 0%, 100%, .5); + border-radius: 5px +} +.sm-dox a.highlighted span.sub-arrow:before { + display: block; + content: '-' +} +.sm-dox>li:first-child>:not(ul) a, +.sm-dox>li:first-child>a { + border-radius: 5px 5px 0 0 +} +.sm-dox>li:last-child>:not(ul) a, +.sm-dox>li:last-child>a, +.sm-dox>li:last-child>ul, +.sm-dox>li:last-child>ul>li:last-child>:not(ul) a, +.sm-dox>li:last-child>ul>li:last-child>a, +.sm-dox>li:last-child>ul>li:last-child>ul, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>:not(ul) a, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>a, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>:not(ul) a, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>:not(ul) a, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul { + border-radius: 0 0 5px 5px +} +.sm-dox>li:last-child>:not(ul) a.highlighted, +.sm-dox>li:last-child>a.highlighted, +.sm-dox>li:last-child>ul>li:last-child>:not(ul) a.highlighted, +.sm-dox>li:last-child>ul>li:last-child>a.highlighted, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>:not(ul) a.highlighted, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>a.highlighted, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>:not(ul) a.highlighted, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a.highlighted, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>:not(ul) a.highlighted, +.sm-dox>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>ul>li:last-child>a.highlighted { + border-radius: 0 +} +.sm-dox ul { + background: hsla(0, 0%, 64%, .1) +} +.sm-dox ul a, +.sm-dox ul a:active, +.sm-dox ul a:focus, +.sm-dox ul a:hover { + font-size: 12px; + border-left: 8px solid transparent; + line-height: 36px; + text-shadow: none; + background-color: #fff; + background-image: none +} +.sm-dox ul a:hover { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAIAAADHFsdbAAAAVUlEQVR4Ae2dSwqAMBBDJ2+kKIqIW8W94CXceP8j2amt5wgJ+Z3B9vOmH1emZSMNM3QJSRkgHDMrkLz4ReN+XA9EHr0fOa/b4OiSd023v/b/fX9Z9V/qQQI0WZ7jfQAAAABJRU5ErkJggg==); + background-repeat: repeat-x; + color: #fff; + text-shadow: 0 1px 1px #000 +} +.sm-dox ul ul a, +.sm-dox ul ul a:active, +.sm-dox ul ul a:focus, +.sm-dox ul ul a:hover { + border-left: 16px solid transparent +} +.sm-dox ul ul ul a, +.sm-dox ul ul ul a:active, +.sm-dox ul ul ul a:focus, +.sm-dox ul ul ul a:hover { + border-left: 24px solid transparent +} +.sm-dox ul ul ul ul a, +.sm-dox ul ul ul ul a:active, +.sm-dox ul ul ul ul a:focus, +.sm-dox ul ul ul ul a:hover { + border-left: 32px solid transparent +} +.sm-dox ul ul ul ul ul a, +.sm-dox ul ul ul ul ul a:active, +.sm-dox ul ul ul ul ul a:focus, +.sm-dox ul ul ul ul ul a:hover { + border-left: 40px solid transparent +} +@mediamin-width768px { + .sm-dox ul { + position: absolute; + width: 12em + } + .sm-dox li { + float: left + } + .sm-dox.sm-rtl li { + float: right + } + .sm-dox.sm-rtl ul li, + .sm-dox.sm-vertical li, + .sm-dox ul li { + float: none + } + .sm-dox a { + white-space: nowrap + } + .sm-dox.sm-vertical a, + .sm-dox ul a { + white-space: normal + } + .sm-dox .sm-nowrap>li>:not(ul) a, + .sm-dox .sm-nowrap>li>a { + white-space: nowrap + } + .sm-dox { + padding: 0 10px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAIAAADHFsdbAAAAcElEQVR4Ae3dTQ6DIBRF4ce70NS4uA51YOLAtFYw0B+gxn06dAddRMGykHO/5K6Ctv3LdaX4fJJ4+RXuvcA+/xkXMbsPJhugbcQ4B9xT2dF43EzAVfscExGa3rIQxGkORZaK5U9zhKKSGYFueODS6h/TSxpOsn4UagAAAABJRU5ErkJggg==); + line-height: 36px + } + .sm-dox a span.sub-arrow { + top: 50%; + margin-top: -2px; + right: 12px; + width: 0; + height: 0; + border-width: 4px; + border-style: solid dashed dashed; + border-color: #283a5d transparent transparent; + background: transparent; + border-radius: 0 + } + .sm-dox a, + .sm-dox a.highlighted, + .sm-dox a:active, + .sm-dox a:focus, + .sm-dox a:hover { + padding: 0 12px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAIAAADHFsdbAAAAf0lEQVR4Ae3dgQmCQABA0aM/URIUhaQimqIlpkmRl4pmljZbG7RIw+RRgzzeGuL1/pBdnmRyIM1/knM/GohPPdHx8XcnzEaHjiDt8PYtfnLDjVuc6Iqt7BqsbYMZ1qyDGt2v0L2K1UYpWbolC6dgbhfMLDkRQqCZkqkh0Yxc/QU8xSP87u6VHwAAAABJRU5ErkJggg==); + background-repeat: no-repeat; + background-position: 100%; + border-radius: 0!important + } + .sm-dox a:hover { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAIAAADHFsdbAAAAVUlEQVR4Ae2dSwqAMBBDJ2+kKIqIW8W94CXceP8j2amt5wgJ+Z3B9vOmH1emZSMNM3QJSRkgHDMrkLz4ReN+XA9EHr0fOa/b4OiSd023v/b/fX9Z9V/qQQI0WZ7jfQAAAABJRU5ErkJggg==); + background-repeat: repeat-x; + color: #fff; + text-shadow: 0 1px 1px #000 + } + .sm-dox a:hover span.sub-arrow { + border-color: #fff transparent transparent + } + .sm-dox a.has-submenu { + padding-right: 24px + } + .sm-dox li { + border-top: 0 + } + .sm-dox>li>ul:after, + .sm-dox>li>ul:before { + content: ''; + position: absolute; + top: -18px; + left: 30px; + width: 0; + height: 0; + overflow: hidden; + border-width: 9px; + border-style: dashed dashed solid; + border-color: transparent transparent #bbb + } + .sm-dox>li>ul:after { + top: -16px; + left: 31px; + border-width: 8px; + border-color: transparent transparent #fff + } + .sm-dox ul { + border: 1px solid #bbb; + padding: 5px 0; + background: #fff; + border-radius: 5px!important; + box-shadow: 0 5px 9px rgba(0, 0, 0, .2) + } + .sm-dox ul a span.sub-arrow { + right: 8px; + top: 50%; + margin-top: -5px; + border-width: 5px; + border-color: transparent transparent transparent #555; + border-style: dashed dashed dashed solid + } + .sm-dox ul a, + .sm-dox ul a.highlighted, + .sm-dox ul a:active, + .sm-dox ul a:focus, + .sm-dox ul a:hover { + border: 0!important; + color: #555; + background-image: none + } + .sm-dox ul a:hover { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAIAAADHFsdbAAAAVUlEQVR4Ae2dSwqAMBBDJ2+kKIqIW8W94CXceP8j2amt5wgJ+Z3B9vOmH1emZSMNM3QJSRkgHDMrkLz4ReN+XA9EHr0fOa/b4OiSd023v/b/fX9Z9V/qQQI0WZ7jfQAAAABJRU5ErkJggg==); + background-repeat: repeat-x; + color: #fff; + text-shadow: 0 1px 1px #000 + } + .sm-dox ul a:hover span.sub-arrow { + border-color: transparent transparent transparent #fff + } + .sm-dox span.scroll-down, + .sm-dox span.scroll-up { + position: absolute; + display: none; + visibility: hidden; + overflow: hidden; + background: #fff; + height: 36px + } + .sm-dox span.scroll-down:hover, + .sm-dox span.scroll-up:hover { + background: #eee + } + .sm-dox span.scroll-up:hover span.scroll-down-arrow, + .sm-dox span.scroll-up:hover span.scroll-up-arrow { + border-color: transparent transparent #d23600 + } + .sm-dox span.scroll-down:hover span.scroll-down-arrow { + border-color: #d23600 transparent transparent + } + .sm-dox span.scroll-down-arrow, + .sm-dox span.scroll-up-arrow { + position: absolute; + top: 0; + left: 50%; + margin-left: -6px; + width: 0; + height: 0; + overflow: hidden; + border-width: 6px; + border-style: dashed dashed solid; + border-color: transparent transparent #555 + } + .sm-dox span.scroll-down-arrow { + top: 8px; + border-style: solid dashed dashed; + border-color: #555 transparent transparent + } + .sm-dox.sm-rtl a.has-submenu { + padding-right: 12px; + padding-left: 24px + } + .sm-dox.sm-rtl a span.sub-arrow { + right: auto; + left: 12px + } + .sm-dox.sm-rtl.sm-vertical a.has-submenu { + padding: 10px 20px + } + .sm-dox.sm-rtl.sm-vertical a span.sub-arrow { + right: auto; + left: 8px; + border-style: dashed solid dashed dashed; + border-color: transparent #555 transparent transparent + } + .sm-dox.sm-rtl>li>ul:before { + left: auto; + right: 30px + } + .sm-dox.sm-rtl>li>ul:after { + left: auto; + right: 31px + } + .sm-dox.sm-rtl ul a.has-submenu { + padding: 10px 20px!important + } + .sm-dox.sm-rtl ul a span.sub-arrow { + right: auto; + left: 8px; + border-style: dashed solid dashed dashed; + border-color: transparent #555 transparent transparent + } + .sm-dox.sm-vertical { + padding: 10px 0; + border-radius: 5px + } + .sm-dox.sm-vertical a { + padding: 10px 20px + } + .sm-dox.sm-vertical a.highlighted, + .sm-dox.sm-vertical a:active, + .sm-dox.sm-vertical a:focus, + .sm-dox.sm-vertical a:hover { + background: #fff + } + .sm-dox.sm-vertical a.disabled { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAIAAADHFsdbAAAAcElEQVR4Ae3dTQ6DIBRF4ce70NS4uA51YOLAtFYw0B+gxn06dAddRMGykHO/5K6Ctv3LdaX4fJJ4+RXuvcA+/xkXMbsPJhugbcQ4B9xT2dF43EzAVfscExGa3rIQxGkORZaK5U9zhKKSGYFueODS6h/TSxpOsn4UagAAAABJRU5ErkJggg==) + } + .sm-dox.sm-vertical a span.sub-arrow { + right: 8px; + top: 50%; + margin-top: -5px; + border-width: 5px; + border-style: dashed dashed dashed solid; + border-color: transparent transparent transparent #555 + } + .sm-dox.sm-vertical>li>ul:after, + .sm-dox.sm-vertical>li>ul:before { + display: none + } + .sm-dox.sm-vertical ul a { + padding: 10px 20px + } + .sm-dox.sm-vertical ul a.highlighted, + .sm-dox.sm-vertical ul a:active, + .sm-dox.sm-vertical ul a:focus, + .sm-dox.sm-vertical ul a:hover { + background: #eee + } + .sm-dox.sm-vertical ul a.disabled { + background: #fff + } +} +#nav-tree .children_ul { + margin: 0; + padding: 4px +} +#nav-tree ul { + list-style: none outside none; + margin: 0; + padding: 0 +} +#nav-tree li { + white-space: nowrap; + margin: 0; + padding: 0 +} +#nav-tree .plus { + margin: 0 +} +#nav-tree img { + margin: 0; + padding: 0; + border: 0; + vertical-align: middle +} +#nav-tree a { + text-decoration: none; + padding: 0; + margin: 0; + outline: none +} +#nav-tree .label { + margin: 0; + padding: 0; + font: 16px "Contax Pro", Lucida Grande, Geneva, Helvetica, Arial, sans-serif; + line-height: 160% +} +#nav-tree .label a { + padding: 2px +} +#nav-tree .children_ul, +#nav-tree .item { + margin: 0; + padding: 0 +} +#nav-tree { + font-size: 14px +} +#doc-content, +#nav-tree { + padding: 0; + overflow: auto +} +#doc-content { + display: block; + margin: 0; + -webkit-overflow-scrolling: touch +} +#side-nav { + padding: 0 6px 0 0; + margin: 0; + position: absolute; + left: 0; + width: 320px +} +#side-nav, +.ui-resizable .ui-resizable-handle { + display: block; +} +.ui-resizable-e { + cursor: ew-resize; + height: 100%; + right: 0; + top: 0; + width: 6px +} +.ui-resizable-handle { + display: none; + font-size: .1px; + position: absolute; + z-index: 1 +} +#nav-tree-contents { + margin: 6px 0 0 +} +#nav-tree { + -webkit-overflow-scrolling: touch +} +#nav-sync { + position: absolute; + top: 5px; + right: 24px; + z-index: 0; + display: none; +} +#nav-sync img { + opacity: .3 +} +#nav-sync img:hover { + opacity: .9 +} +@media print { + #nav-tree { + display: none + } + div.ui-resizable-handle { + display: none; + position: relative + } +} +#FSearchBox { + float: left +} +#MSearchBox { + white-space: nowrap; + float: none; + margin-top: 0; + right: 0; + width: 170px; + height: 24px; + z-index: 102; + display: none; + position: absolute +} +#MSearchSelect { + display: block; + position: absolute; + width: 20px; + height: 19px +} +.left #MSearchSelect { + left: 4px +} +.right #MSearchSelect { + right: 5px +} +#MSearchField { + border: none; + width: 111px; + margin-left: 20px; + outline: none; + -webkit-border-radius: 0 +} +#FSearchBox #MSearchField { + margin-left: 15px +} +#MSearchClose { + display: none; + position: absolute; + top: 4px; + background: none; + border: none; + margin: 0 4px 0 0; + padding: 0; + outline: none +} +.left #MSearchClose { + left: 6px +} +.right #MSearchClose { + right: 2px +} +.MSearchBoxActive #MSearchField { + color: #000 +} +#MSearchSelectWindow { + display: none; + position: absolute; + left: 0; + top: 0; + background-color: #f9fafc; + z-index: 10001; + padding-top: 4px; + padding-bottom: 4px; + -moz-border-radius: 4px; + -webkit-border-top-left-radius: 4px; + -webkit-border-top-right-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, .15) +} +.SelectItem { + font: 8pt Arial, Verdana, sans-serif; + padding-left: 2px; + padding-right: 12px; + border: 0 +} +span.SelectionMark { + margin-right: 4px; + font-family: monospace; + outline-style: none; + text-decoration: none +} +a.SelectItem { + display: block; + padding-left: 6px; + padding-right: 12px +} +a.SelectItem, +a.SelectItem:active, +a.SelectItem:focus { + outline-style: none; + color: #000; + text-decoration: none +} +a.SelectItem:hover { + color: #fff; + outline-style: none; + text-decoration: none; + cursor: pointer; + display: block +} +iframe#MSearchResults { + width: 60ex; + height: 15em +} +#MSearchResultsWindow { + display: none; + position: absolute; + left: 0; + top: 0; + border: 1px solid #000; + z-index: 10000 +} +#SRIndex { + clear: both; + padding-bottom: 15px +} +.SREntry { + font: 400 10px/16px "Contax Pro", sans-serif; + font-size: 14pt; + padding-left: 1ex +} +.SRPage .SREntry { + font-size: 10pt; + padding: 1px 5px +} +body.SRPage { + margin: 5px 2px +} +.SRChildren { + padding-left: 3ex; + padding-bottom: .5em +} +.SRPage .SRChildren { + display: none +} +.SRSymbol { + font-weight: 700 +} +.SRSymbol, +a.SRScope { + color: #425e97; + font-family: Arial, Verdana, sans-serif; + text-decoration: none; + outline: none +} +a.SRScope { + display: block +} +a.SRScope:active, +a.SRScope:focus, +a.SRSymbol:active, +a.SRSymbol:focus { + text-decoration: underline +} +span.SRScope { + padding-left: 4px +} +.SRPage .SRStatus { + padding: 2px 5px; + font-size: 8pt; + font-style: italic +} +.SRResult { + display: none +} +DIV.searchresults { + margin-left: 10px; + margin-right: 10px +} +.searchresult { + background-color: #f0f3f8 +} +.pages b { + color: #fff; + padding: 5px 5px 3px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAIAAADHFsdbAAAAVUlEQVR4Ae2dSwqAMBBDJ2+kKIqIW8W94CXceP8j2amt5wgJ+Z3B9vOmH1emZSMNM3QJSRkgHDMrkLz4ReN+XA9EHr0fOa/b4OiSd023v/b/fX9Z9V/qQQI0WZ7jfQAAAABJRU5ErkJggg==); + background-repeat: repeat-x; + text-shadow: 0 1px 1px #000 +} +.pages { + line-height: 17px; + margin-left: 4px; + text-decoration: none +} +.hl { + font-weight: 700 +} +#searchresults { + margin-bottom: 20px +} +.searchpages { + margin-top: 10px +} +body, +div, +dl, +p, +table { + font: 400 16px/24px "Contax Pro", sans-serif; +} +h1.groupheader { + font-size: 150% +} +.title { + font: 400 16px/32px "Contax Pro", sans-serif; + font-weight: 700; + font-size: 32px; + margin: 10px 2px +} +h2.groupheader { + font-size: 150%; + font-weight: 400; + margin-top: 1.75em; + padding-top: 8px; + padding-bottom: 4px; + width: 100% +} +h3.groupheader { + font-size: 100% +} +h1, +h2, +h3, +h4, +h5, +h6 { + -webkit-transition: text-shadow .5s linear; + transition: text-shadow .5s linear; + margin-right: 15px +} +h1.glow, +h2.glow, +h3.glow, +h4.glow, +h5.glow, +h6.glow { + text-shadow: 0 0 15px cyan +} +dt { + font-weight: 700 +} +div.multicol { + -moz-column-gap: 1em; + -webkit-column-gap: 1em; + -moz-column-count: 3; + -webkit-column-count: 3 +} +p.startdd, +p.startli { + margin-top: 2px +} +p.starttd { + margin-top: 0 +} +p.endli { + margin-bottom: 0 +} +p.enddd { + margin-bottom: 4px +} +p.endtd { + margin-bottom: 2px +} +caption { + font-weight: 700 +} +span.legend { + font-size: 70%; + text-align: center +} +h3.version { + font-size: 90%; + text-align: center +} +div.navtab, +div.qindex { + background-color: #ebeff6; + border: 1px solid #a3b4d7; + text-align: center +} +div.navpath, +div.qindex { + width: 100%; + line-height: 140% +} +div.navtab { + margin-right: 15px +} +.contents a:visited { + color: #121c2f +} +a:hover { + text-decoration: underline +} +a.qindex, +a.qindexHL { + font-weight: 700 +} +a.qindexHL { + background-color: #9cafd4; + color: #fff; + border: 1px double #869dca +} +.contents a.qindexHL:visited { + color: #fff +} +a.el { + font-weight: 700 +} +a.code, +a.code:visited, +a.codeRef, +a.codeRef:visited, +a.line, +a.line:visited, +a.lineRef, +a.lineRef:visited { + color: #121c2f +} +dl.el { + margin-left: -1cm +} +pre.fragment { + padding: 4px 6px; + overflow: auto; + word-wrap: break-word; + font-size: 9pt; + line-height: 125%; + font-family: monospace, fixed; + font-size: 105% +} +div.fragment, +pre.fragment { + border: 1px solid #c4cfe5; + background-color: #fbfcfd; + margin: 4px 8px 4px 2px +} +div.fragment { + padding: 0 +} +div.line { + font-family: monospace, fixed; + font-size: 13px; + min-height: 13px; + line-height: 1; + text-wrap: unrestricted; + white-space: -moz-pre-wrap; + white-space: -pre-wrap; + white-space: -o-pre-wrap; + white-space: pre-wrap; + word-wrap: break-word; + text-indent: -53px; + padding-left: 53px; + padding-bottom: 0; + margin: 0; + -webkit-transition-property: background-color, box-shadow; + -webkit-transition-duration: .5s; + -moz-transition-property: background-color, box-shadow; + -moz-transition-duration: .5s; + -ms-transition-property: background-color, box-shadow; + -ms-transition-duration: .5s; + -o-transition-property: background-color, box-shadow; + -o-transition-duration: .5s; + transition-property: background-color, box-shadow; + transition-duration: .5s +} +div.line:after { + white-space: pre +} +div.line.glow { + background-color: cyan; + box-shadow: 0 0 10px cyan +} +span.lineno { + padding-right: 4px; + text-align: right; + border-right: 2px solid #0f0; + background-color: #e8e8e8; + white-space: pre +} +span.lineno a { + background-color: #d8d8d8 +} +span.lineno a:hover { + background-color: #c8c8c8 +} +.lineno { + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none +} +div.ah, +span.ah { + background-color: #000; + font-weight: 700; + color: #fff; + margin-bottom: 3px; + margin-top: 3px; + padding: .2em; + border: thin solid #333; + border-radius: .5em; + -webkit-border-radius: .5em; + -moz-border-radius: .5em; + box-shadow: 2px 2px 3px #999; + -webkit-box-shadow: 2px 2px 3px #999; + -moz-box-shadow: rgba(0, 0, 0, .15) 2px 2px 2px; + background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000), color-stop(.3, #444)); + background-image: -moz-linear-gradient(center top, #eee 0, #444 40%, #000 110%) +} +div.classindex ul { + list-style: none; + padding-left: 0 +} +div.classindex span.ai { + display: inline-block +} +div.groupHeader { + margin-left: 16px; + margin-top: 12px; + font-weight: 700 +} +div.groupText { + margin-left: 16px; + font-style: italic +} +body { + background-color: #fff; + color: #000; + margin: 0 +} +div.contents { + margin-top: 10px; + margin-left: 12px; + margin-right: 8px +} +td.indexkey { + font-weight: 700; + white-space: nowrap; + vertical-align: top +} +td.indexkey, +td.indexvalue { + background-color: #ebeff6; + border: 1px solid #c4cfe5; + margin: 2px 0; + padding: 2px 10px +} +tr.memlist { + background-color: #eef1f7 +} +p.formulaDsp { + text-align: center +} +img.formulaInl { + vertical-align: middle +} +div.center { + text-align: center; + margin-top: 0; + margin-bottom: 0; + padding: 0 +} +div.center img { + border: 0 +} +address.footer { + text-align: right; + padding-right: 12px +} +img.footer { + border: 0; + vertical-align: middle +} +span.keyword { + color: green +} +span.keywordtype { + color: #604020 +} +span.keywordflow { + color: #e08000 +} +span.comment { + color: maroon +} +span.preprocessor { + color: #806020 +} +span.stringliteral { + color: #002080 +} +span.charliteral { + color: teal +} +span.vhdldigit { + color: #f0f +} +span.vhdlchar { + color: #000 +} +span.vhdlkeyword { + color: #700070 +} +span.vhdllogic { + color: red +} +blockquote { + background-color: #f7f8fb; + border-left: 2px solid #9cafd4; + margin: 0 24px 0 4px; + padding: 0 12px 0 16px +} +td.tiny { + font-size: 75% +} +.dirtab { + padding: 4px; + border-collapse: collapse; + border: 1px solid #a3b4d7 +} +th.dirtab { + background: #ebeff6; + font-weight: 700 +} +hr { + height: 0; + border: none +} +hr.footer { + height: 1px +} +table.memberdecls { + border-spacing: 0; + padding: 0 +} +.fieldtable tr, +.memberdecls td { + -webkit-transition-property: background-color, box-shadow; + -webkit-transition-duration: .5s; + -moz-transition-property: background-color, box-shadow; + -moz-transition-duration: .5s; + -ms-transition-property: background-color, box-shadow; + -ms-transition-duration: .5s; + -o-transition-property: background-color, box-shadow; + -o-transition-duration: .5s; + transition-property: background-color, box-shadow; + transition-duration: .5s +} +.fieldtable tr.glow, +.memberdecls td.glow { + background-color: cyan; + box-shadow: 0 0 15px cyan +} +.mdescLeft, +.mdescRight, +.memItemLeft, +.memItemRight, +.memTemplItemLeft, +.memTemplItemRight, +.memTemplParams { + border: none; + margin: 4px; + padding: 1px 0 0 8px +} +.mdescLeft, +.mdescRight { + padding: 0 8px 4px; + color: #555 +} +.memSeparator { + border-bottom: 1px solid #dee4f0; + line-height: 1px; + margin: 0; + padding: 0 +} +.memItemLeft, +.memTemplItemLeft { + white-space: nowrap +} +.memItemRight { + width: 100% +} +.memTemplParams { + color: #4665a2; + white-space: nowrap; + font-size: 80% +} +.memtitle { + padding: 8px; + border-top: 1px solid #a8b8d9; + border-left: 1px solid #a8b8d9; + border-right: 1px solid #a8b8d9; + border-top-right-radius: 4px; + border-top-left-radius: 4px; + margin-bottom: -1px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA4CAIAAACzAgW7AAAAYElEQVR4Ae3dSw6AIAxF0Za3WweG+IFC0W1r4sTCSBwYl3By07wugo7zguqOpBtSNlogVkkFsRJFkII1arOEbBTzmptpSZis3urnSjCM0RHRL477m5kdEXX48fPevzZzA0gYIN0BAPV5AAAAAElFTkSuQmCC); + background-repeat: repeat-x; + background-color: #e2e8f2; + line-height: 1.25; + font-weight: 300; + float: left +} +.permalink { + font-size: 65%; + display: inline-block; + vertical-align: middle +} +.memtemplate { + font-size: 80%; + color: #4665a2; + font-weight: 400; + margin-left: 9px +} +.memnav { + background-color: #ebeff6; + border: 1px solid #a3b4d7; + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px +} +.memitem, +.mempage { + width: 100% +} +.memitem { + padding: 0; + margin-bottom: 10px; + margin-right: 5px; + -webkit-transition: box-shadow .5s linear; + transition: box-shadow .5s linear; + display: table!important +} +.memitem.glow { + box-shadow: 0 0 15px cyan +} +.memname { + font-weight: 400; + margin-left: 6px +} +.memname td { + vertical-align: bottom +} +.memproto, +dl.reflist dt { + border-top: 1px solid #a8b8d9; + border-left: 1px solid #a8b8d9; + border-right: 1px solid #a8b8d9; + padding: 6px 0; + color: #253555; + font-weight: 700; + text-shadow: 0 1px 1px hsla(0, 0%, 100%, .9); + background-color: #dfe5f1; + box-shadow: 5px 5px 5px rgba(0, 0, 0, .15); + border-top-right-radius: 4px; + -moz-box-shadow: rgba(0, 0, 0, .15) 5px 5px 5px; + -moz-border-radius-topright: 4px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, .15); + -webkit-border-top-right-radius: 4px +} +.overload { + font-family: courier new, courier, monospace; + font-size: 65% +} +.memdoc, +dl.reflist dd { + border-bottom: 1px solid #a8b8d9; + border-left: 1px solid #a8b8d9; + border-right: 1px solid #a8b8d9; + padding: 6px 10px 2px; + background-color: #fbfcfd; + border-top-width: 0; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAGCAYAAAACEPQxAAAAJklEQVR4Ae3dMQ0AAAgDwU9IF2aE4V8NLT5+uOVNIGnLTejAgwcHD1MAvfyCPAUAAAAASUVORK5CYII=); + background-repeat: repeat-x; + background-color: #fff; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + box-shadow: 5px 5px 5px rgba(0, 0, 0, .15); + -moz-border-radius-bottomleft: 4px; + -moz-border-radius-bottomright: 4px; + -moz-box-shadow: rgba(0, 0, 0, .15) 5px 5px 5px; + -webkit-border-bottom-left-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, .15) +} +dl.reflist dt { + padding: 5px +} +dl.reflist dd { + margin: 0 0 10px; + padding: 5px +} +.paramkey { + text-align: right +} +.paramname, +.paramtype { + white-space: nowrap +} +.paramname { + color: #602020 +} +.paramname em { + font-style: normal +} +.paramname code { + line-height: 14px +} +.exception, +.params, +.retval, +.tparams { + margin-left: 0; + padding-left: 0 +} +.params .paramname, +.retval .paramname { + font-weight: 700; + vertical-align: top +} +.params .paramtype { + font-style: italic; + vertical-align: top +} +.params .paramdir { + font-family: courier new, courier, monospace; + vertical-align: top +} +table.mlabels { + border-spacing: 0 +} +td.mlabels-left { + width: 100%; + padding: 0 +} +td.mlabels-right { + vertical-align: bottom; + padding: 0; + white-space: nowrap +} +span.mlabels { + margin-left: 8px +} +span.mlabel { + background-color: #728dc1; + border-top: 1px solid #5373b4; + border-left: 1px solid #5373b4; + border-right: 1px solid #c4cfe5; + border-bottom: 1px solid #c4cfe5; + text-shadow: none; + color: #fff; + margin-right: 4px; + padding: 2px 3px; + border-radius: 3px; + font-size: 7pt; + white-space: nowrap; + vertical-align: middle +} +div.directory { + margin: 10px 0; + border-top: 1px solid #9cafd4; + border-bottom: 1px solid #9cafd4; + width: 100% +} +.directory table { + border-collapse: collapse +} +.directory td { + margin: 0; + padding: 0; + vertical-align: top +} +.directory td.entry { + white-space: nowrap; + padding-right: 6px; + padding-top: 3px +} +.directory td.entry a { + outline: none +} +.directory td.entry a img { + border: none +} +.directory td.desc { + width: 100%; + padding-left: 6px; + padding-right: 6px; + padding-top: 3px; + border-left: 1px solid rgba(0, 0, 0, .05) +} +.directory tr.even { + padding-left: 6px; + background-color: #f7f8fb +} +.directory img { + vertical-align: -30% +} +.directory .levels { + white-space: nowrap; + width: 100%; + text-align: right; + font-size: 9pt +} +.directory .levels span { + cursor: pointer; + padding-left: 2px; + padding-right: 2px; + color: #3d578c +} +.arrow { + color: #9cafd4; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + cursor: pointer; + font-size: 80%; + height: 22px +} +.arrow, +.icon { + display: inline-block; + width: 16px +} +.icon { + font-family: Arial, Helvetica; + font-weight: 700; + font-size: 12px; + height: 14px; + background-color: #728dc1; + color: #fff; + text-align: center; + border-radius: 4px; + margin-left: 2px; + margin-right: 2px +} +.icona { + width: 24px; + height: 22px; + display: inline-block +} +.iconfopen { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAADafVyIAAACHElEQVR4Ae1dP2/TUBD/OWmaNGmwHTuNEGlpk7aJWooAiZGBiQ/AwDdgYujU2ayd2PkOLEjsVSf0JBaQKoFUtV2CVKFEHlDaxDZ3z32JHTuhQzsgYb/Tnd+f+93v7p68akEQAMCtSQYAblP+fYA5AEiT044bfD/twfcDDD1fysaKga2GpQHAdWUqADuvWUXkc1nk5kKin7/+xJejc9kVAb0avdmMhgzJqxebqcBZx3EAICFHx78cdsyHudHYrpoLsIyC1Ea5AH1xHqViDl33Ag837bcAMCnaZJu+//At6Lp9UGbko9ZZezSZ0cJAffrm9PEy2/zUlxbx+uVOjEmCwceDY+fBuiWjrFWKsEmzbRtjsfQFmOW81Mad/Mg+6bh4/nQ5xiS1Bv0LT+ZWRSr1VbTMgucUI57XiJXv+3IdQGwkAPhQ/3JIAGFhGccbpQmym2RarnLokeNxAEmEBABvvBz4VFyOLHSqahAyCB1GQXgfB3YtBkyfGXDXjB1wClTESS8KXKVzZhftvTsMalZpVIPo+qRvXmNwxfy8+xv7u89iXZTCgKKkPA+GYf7VnLKT39MDmHmTow6nOY86jO75K8CPsx6A8eAsRQueZrM26U4AiI3ERaNLVX3cXhI7G7bYblqidd8UrVVTNJcN0azrYu2eTrYu2mum2GpUxPa6JR61quIJnWmvVsTK3fKnmQzI+RsAuCn5/0cDgJnyB7pKCEBUoHiUAAAAAElFTkSuQmCC) +} +.iconfclosed, +.iconfopen { + width: 24px; + height: 18px; + margin-bottom: 4px; + background-position: 0 -4px; + background-repeat: repeat-y; + vertical-align: top; + display: inline-block +} +.iconfclosed { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAADafVyIAAACL0lEQVR4Ae1dTU/UQBh+2vp12JBscF32A78jm8VdUFmQRUOIXDn5A7x50d9g1sT/4IH/wMl48+IBokMgJhA9cdDEEI0HowGXdlrnnXa2M22BkNiDh3aeTPtO533e933enb1aQRAAQG6wASBP5E5wCgCSePP+S7Dx8RuAeNxqlLA4c9ECgJMgk4Ccj18bHrxbwu3mp+9EAAAngpUUeXllK/i8+ws3IwJyTp9s7/wIayoMvjDQrF9kq18o4PHDlrHg9Ho9APF49Xan92ipiXq5gJrYUC0V5PPkjZLMqnX9vCQfu1xE40oRY5dCNK8O493WLhY6o8+PLdHP330ZtYpMRe26/iAjl/vhuh/AE89nTjsAkEKKgDbv/fHkrJyF9kCS0OXxcCYbmWg+cDkApJCZAUVFzqyozsqRIqB1pZ1uB4AkUiI/e7kWPJgeheuFJVBOdOIkiRTftrH64StePOkaIqcyoI2qRHGUcbRcrKvSmQRhlgCMkalB/4APItS1oJnqn+hQo30BGCNF4Hoce/suOGkg7nCz6ihBRHdEpgdFBDzqrGNFphYkDUhkysQWDJSNLjrZDEeOLQMAYIxMgv2+J6KJxDykQxxJqr072cdUWmSxaX07Puj034J61ztL16c4dBYADKSOCnEclBY6dXb/dpXdm6yy2XZF4m57hE23RlhnvMxmWhXWnaiwuYkqmxPfzN+psfmpOptqlllx6NzrIzMQ589TAPhX+P//0XIn+AvU+Rz5ggypoQAAAABJRU5ErkJggg==) +} +.icondoc { + width: 24px; + height: 18px; + margin-bottom: 4px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAWCAYAAADafVyIAAACsUlEQVR4Ae2dTU9TWxiFn55z+mE/LVhaKFAVRBI0gh8gQQZXYnVgYgwJNzd35EhGxhlDy9SBf8L/4C9gdm+EARGIQVAD8nGLUKBAC6373QUT6Dk4MAzu4KQru6fdedde71rvOVNXuVwGODMYAGeJMyewAE7iw6dsubhfYq9woO/l+8ZWgdzWHqGAB5/XIqzWhliAZF3QBeAEM5PJABzDxMx/mXiNn6DfTeCcWxc851NQa3Zjl2jIJ4WZmF7FbRmZaNg3CmAH2xaZpgvDqMDlcuFxmwQVkZy+IRZkYWVLn/7G1Zg6zCqzX9cdk+LogWkaP0kElmUQUCpCATefv+X0HiG53RFncjbLcjZvS2Lrgf7j8PRySZTLVIj8qoyoePP2PZv5oiaJKGUr3/PEa/0Ax2DrwdxiLpO4ENAFV9d3MKWwatF6TpmsfKlXReO1AaJhrzZb9liGQWvT+SovnBWoFomAyY9ZraD/VpJ/p5Z1smrCPjFXCioVBb1/t7APUAVHD456/6gvRWd7DJ/H4mFvisGBVvo6G+i/maQxESQS9FKnElcslgCq4KhAiss1Nr7A1NwaLY0Rvixt6rjOL+bouZYgEvJyNRWlVCpTKFZmBjj2OXWSDdWjB3eb+fNhGwM9zTx70qFVjA73cq8ryeVkRM9GJOgBsIWjAum/YHr+u8769k6RtdyuHjBRM6N+X17L8+KvTj2IAHZwVOCxTJ2eVH2I7mtxhtJtPB+8ztM/Wmi/WKPvX/7dpVspgwlgB2fqw2EbG1/UKuTUMmAnPZD1tEb/MkXiwVD6Cve7m2w9kDiLVwB2sCWQVEhxyb88IqTvRw++xnhIeyPG1qth1ErV3gOHF5dti4Sg5/EIS3P/4PFWigDYobC3TeLSHV6NDANUwZYg3Ztypd+9Bvht/P9fmT8AqlfEsPcjdQ8AAAAASUVORK5CYII=); + background-position: 0 -4px; + background-repeat: repeat-y; + vertical-align: top; + display: inline-block +} +table.directory { + font: 400 14px "Contax Pro", sans-serif +} +div.dynheader { + margin-top: 8px; + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none +} +address { + font-style: normal; + color: #2a3d61 +} +table.doxtable caption { + caption-side: top +} +table.doxtable { + border-collapse: collapse; + margin-top: 4px; + margin-bottom: 4px +} +table.doxtable td, +table.doxtable th { + border: 1px solid #2d4068; + padding: 3px 7px 2px +} +table.doxtable th { + background-color: #374f7f; + color: #fff; + font-size: 110%; + padding-bottom: 4px; + padding-top: 5px +} +table.fieldtable { + margin-bottom: 10px; + border: 1px solid #a8b8d9; + border-spacing: 0; + border-radius: 4px; + box-shadow: 2px 2px 2px rgba(0, 0, 0, .15) +} +.fieldtable td, +.fieldtable th { + padding: 3px 7px 2px +} +.fieldtable td.fieldname, +.fieldtable td.fieldtype { + white-space: nowrap; + border-right: 1px solid #a8b8d9; + border-bottom: 1px solid #a8b8d9; + vertical-align: top +} +.fieldtable td.fieldname { + padding-top: 3px +} +.fieldtable td.fielddoc { + border-bottom: 1px solid #a8b8d9 +} +.fieldtable td.fielddoc p:first-child { + margin-top: 0 +} +.fieldtable td.fielddoc p:last-child { + margin-bottom: 2px +} +.fieldtable tr:last-child td { + border-bottom: none +} +.fieldtable th { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA4CAIAAACzAgW7AAAAYElEQVR4Ae3dSw6AIAxF0Za3WweG+IFC0W1r4sTCSBwYl3By07wugo7zguqOpBtSNlogVkkFsRJFkII1arOEbBTzmptpSZis3urnSjCM0RHRL477m5kdEXX48fPevzZzA0gYIN0BAPV5AAAAAElFTkSuQmCC); + background-repeat: repeat-x; + background-color: #e2e8f2; + font-size: 90%; + color: #253555; + padding-bottom: 4px; + padding-top: 5px; + text-align: left; + font-weight: 400; + -moz-border-radius-topleft: 4px; + -moz-border-radius-topright: 4px; + -webkit-border-top-left-radius: 4px; + -webkit-border-top-right-radius: 4px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom: 1px solid #a8b8d9 +} +.tabsearch { + top: 0; + left: 10px; + height: 36px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAIAAADHFsdbAAAAcElEQVR4Ae3dTQ6DIBRF4ce70NS4uA51YOLAtFYw0B+gxn06dAddRMGykHO/5K6Ctv3LdaX4fJJ4+RXuvcA+/xkXMbsPJhugbcQ4B9xT2dF43EzAVfscExGa3rIQxGkORZaK5U9zhKKSGYFueODS6h/TSxpOsn4UagAAAABJRU5ErkJggg==); + z-index: 101; + overflow: hidden; + font-size: 13px +} +.navpath ul { + font-size: 11px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAIAAADHFsdbAAAAcElEQVR4Ae3dTQ6DIBRF4ce70NS4uA51YOLAtFYw0B+gxn06dAddRMGykHO/5K6Ctv3LdaX4fJJ4+RXuvcA+/xkXMbsPJhugbcQ4B9xT2dF43EzAVfscExGa3rIQxGkORZaK5U9zhKKSGYFueODS6h/TSxpOsn4UagAAAABJRU5ErkJggg==); + background-repeat: repeat-x; + background-position: 0 -5px; + height: 30px; + line-height: 30px; + color: #8aa0cc; + border: 1px solid #c2cde4; + overflow: hidden; + margin: 0; + padding: 0 +} +.navpath li { + list-style-type: none; + float: left; + padding-left: 10px; + padding-right: 15px; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAeCAYAAAARgF8NAAACa0lEQVR4Ae2dy2sTURTGz525ycykSSaTpg9tmiYxNTYqbsSFlAbcuJBSLDQLK0i1KFUbrWKUqhQxgoqIj0oXLrooRbdtEd+P+mjrSm1LUydDmyiC6OTRhaQIEu8MJuTW/guH73LO5fzuvZwzZ/Yoevf90iZfORDzfZLVnwBAiW3adSBgEgzYaGDx99SvCQCghPoGJrfxHB7x19l+k72X3PKHAs7d0Q9NNLgliTOypz/K6mgpgP/5gR+ZXMRZaT5KYgpAZ/vfad6IEPqy0WtnGQYFp+PqXBHova0DmkWdVeaddis/RYDuInDm1ttCXINZJhbw2PMkdk0r6pIORG68KX3y/jqnWG/iDYMzitqvAyevvy4FgmbBMOx1ijnyTP1qgGYfNrglqwEzR2aU1CPUc20cACgdLBf5w2sqypKzSqoFha+8AgBKAsuib+QWhpS8FXVffgkAsHJdJSUHbRZuHHVdeg4AsHI1W83GsKva8pUBAFhltZKGSfk8yOjQxWcAQEnU2t7gteszgjovPAUASsccktBRKQnxuYV0G9rf9wQAKE37XDYz6UNnbCH9Au07/7g02Wji8T33WusyOa13kt3StLcUiFY7ykwYM4NqJjept7q992EhSYYBKevrJC32xxbT+gCzmxuLN3RJVr5W4PHU/GJmqDgPociDQjzvq7VpbW7/nMgUh4QNbN+j+R0Ch9tEC5cjyQg1k60nxjQ/7Kyy+E0CHpITmZsUsLtnrIJ8NcXnErW9R05k0xTQcnz0lMMmhOwiNysnsx0AQAk1h0finhqRxxiF4smsXjv145CWLjMI0nIi/V9Ss7/CQLJvSb7lJAAAAABJRU5ErkJggg==); + background-repeat: no-repeat; + background-position: 100%; + color: #364d7c +} +.navpath li.navelem a { + height: 32px; + display: block; + outline: none; + color: #283a5d; + font-family: Lucida Grande, Geneva, Helvetica, Arial, sans-serif; + text-shadow: 0 1px 1px hsla(0, 0%, 100%, .9); + text-decoration: none +} +.navpath li.navelem a:hover { + color: #6884bd +} +.navpath li.footer { + list-style-type: none; + float: right; + padding-left: 10px; + padding-right: 15px; + background-image: none; + background-repeat: no-repeat; + background-position: 100%; + color: #364d7c; + font-size: 8pt +} +div.summary { + float: right; + font-size: 8pt; + padding-right: 5px; + width: 50%; + text-align: right +} +div.summary a, +table.classindex { + white-space: nowrap +} +table.classindex { + margin: 10px; + margin-left: 3%; + margin-right: 3%; + width: 94%; + border: 0; + border-spacing: 0; + padding: 0 +} +div.ingroups { + font-size: 8pt; + width: 50%; + text-align: left +} +div.ingroups a { + white-space: nowrap +} +div.header { + background-color: #f9fafc; + margin: 0; + border-bottom: 1px solid #c4cfe5 +} +div.headertitle { + padding: 5px 5px 5px 10px +} +dl { + padding: 0 0 0 10px +} +dl.section { + margin-left: 0; + padding-left: 0 +} +dl.note { + border-color: #d0c000 +} +dl.attention, +dl.note, +dl.warning { + margin-left: -7px; + padding-left: 3px; + border-left: 4px solid +} +dl.attention, +dl.warning { + border-color: red +} +dl.invariant, +dl.post, +dl.pre { + border-color: #00d000 +} +dl.deprecated, +dl.invariant, +dl.post, +dl.pre { + margin-left: -7px; + padding-left: 3px; + border-left: 4px solid +} +dl.deprecated { + border-color: #505050 +} +dl.todo { + border-color: #00c0e0 +} +dl.test, +dl.todo { + margin-left: -7px; + padding-left: 3px; + border-left: 4px solid +} +dl.test { + border-color: #3030e0 +} +dl.bug { + margin-left: -7px; + padding-left: 3px; + border-left: 4px solid; + border-color: #c08050 +} +dl.section dd { + margin-bottom: 6px +} +#projectlogo { + text-align: center; + vertical-align: bottom; + border-collapse: separate +} +#projectlogo img { + border: 0 none +} +#projectalign { + vertical-align: middle +} +#projectname { + font: 300% Tahoma, Arial, sans-serif; + margin: 0; + padding: 2px 0 +} +#projectbrief { + font: 120% Tahoma, Arial, sans-serif; + margin: 0; + padding: 0 +} +#projectnumber { + font: 50% Tahoma, Arial, sans-serif; + margin: 0; + padding: 0 +} +#titlearea { + padding: 0; + margin: 0; + width: 100%; + border-bottom: 1px solid #dcd9d9 +} +.diagraph, +.dotgraph, +.image, +.mscgraph { + text-align: center +} +.caption { + font-weight: 700 +} +div.zoom { + border: 1px solid #90a5ce +} +dl.citelist { + margin-bottom: 50px +} +dl.citelist dt { + color: #334975; + float: left; + font-weight: 700; + margin-right: 10px; + padding: 5px +} +dl.citelist dd { + margin: 2px 0; + padding: 5px 0 +} +div.toc { + padding: 14px 25px; + background-color: #f4f6fa; + border: 1px solid #d8dfee; + border-radius: 7px 7px 7px 7px; + float: right; + height: auto; + margin: 0 8px 10px 10px; + width: 200px +} +div.toc li { + background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAICAYAAAA1BOUGAAAAWklEQVR4Ae2dyw2AIBBEn1CWMfFsG55twAtysQFqsi5lDOiGRFvYyb7Zz9QAvLWm47TeAXzpf5mjNoBWmusztAfFBz9Mcycofaw+KwqeS/Mc96W/YxFoYBeCC17XGwSD3o1uAAAAAElFTkSuQmCC) no-repeat scroll 0 5px transparent; + font: 10px/1.2 Verdana, DejaVu Sans, Geneva, sans-serif; + margin-top: 5px; + padding-left: 10px; + padding-top: 2px +} +div.toc h3 { + font: 700 12px/1.2 Arial, FreeSans, sans-serif; + color: #4665a2; + border-bottom: 0 none; + margin: 0 +} +div.toc ul { + list-style: none outside none; + border: medium none; + padding: 0 +} +div.toc li.level1 { + margin-left: 0 +} +div.toc li.level2 { + margin-left: 15px +} +div.toc li.level3 { + margin-left: 30px +} +div.toc li.level4 { + margin-left: 45px +} +.inherit_header { + font-weight: 700; + color: gray; + cursor: pointer; + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none +} +.inherit_header td { + padding: 6px 0 2px 5px +} +.inherit { + display: none +} +tr.heading h2 { + margin-top: 12px; + margin-bottom: 4px +} +#powerTip, +.ttc { + position: absolute; + display: none +} +#powerTip { + cursor: default; + white-space: nowrap; + background-color: #fff; + border: 1px solid gray; + border-radius: 4px 4px 4px 4px; + box-shadow: 1px 1px 7px gray; + font-size: smaller; + max-width: 80%; + opacity: .9; + padding: 1ex 1em 1em; + z-index: 2147483647 +} +#powerTip div.ttdoc { + color: grey; + font-style: italic +} +#powerTip div.ttname, +#powerTip div.ttname a { + font-weight: 700 +} +#powerTip div.ttdeci { + color: #006318 +} +#powerTip div { + margin: 0; + padding: 0; + font: 12px/16px "Contax Pro", sans-serif +} +#powerTip:after, +#powerTip:before { + content: ""; + position: absolute; + margin: 0 +} +#powerTip.e:after, +#powerTip.e:before, +#powerTip.n:after, +#powerTip.n:before, +#powerTip.ne:after, +#powerTip.ne:before, +#powerTip.nw:after, +#powerTip.nw:before, +#powerTip.s:after, +#powerTip.s:before, +#powerTip.se:after, +#powerTip.se:before, +#powerTip.sw:after, +#powerTip.sw:before, +#powerTip.w:after, +#powerTip.w:before { + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute +} +#powerTip.e:after, +#powerTip.n:after, +#powerTip.ne:after, +#powerTip.nw:after, +#powerTip.s:after, +#powerTip.se:after, +#powerTip.sw:after, +#powerTip.w:after { + border-color: hsla(0, 0%, 100%, 0) +} +#powerTip.e:before, +#powerTip.n:before, +#powerTip.ne:before, +#powerTip.nw:before, +#powerTip.s:before, +#powerTip.se:before, +#powerTip.sw:before, +#powerTip.w:before { + border-color: hsla(0, 0%, 50%, 0) +} +#powerTip.n:after, +#powerTip.n:before, +#powerTip.ne:after, +#powerTip.ne:before, +#powerTip.nw:after, +#powerTip.nw:before { + top: 100% +} +#powerTip.n:after, +#powerTip.ne:after, +#powerTip.nw:after { + border-top-color: #fff; + border-width: 10px; + margin: 0 -10px +} +#powerTip.n:before { + border-top-color: gray; + border-width: 11px; + margin: 0 -11px +} +#powerTip.n:after, +#powerTip.n:before { + left: 50% +} +#powerTip.nw:after, +#powerTip.nw:before { + right: 14px +} +#powerTip.ne:after, +#powerTip.ne:before { + left: 14px +} +#powerTip.s:after, +#powerTip.s:before, +#powerTip.se:after, +#powerTip.se:before, +#powerTip.sw:after, +#powerTip.sw:before { + bottom: 100% +} +#powerTip.s:after, +#powerTip.se:after, +#powerTip.sw:after { + border-bottom-color: #fff; + border-width: 10px; + margin: 0 -10px +} +#powerTip.s:before, +#powerTip.se:before, +#powerTip.sw:before { + border-bottom-color: gray; + border-width: 11px; + margin: 0 -11px +} +#powerTip.s:after, +#powerTip.s:before { + left: 50% +} +#powerTip.sw:after, +#powerTip.sw:before { + right: 14px +} +#powerTip.se:after, +#powerTip.se:before { + left: 14px +} +#powerTip.e:after, +#powerTip.e:before { + left: 100% +} +#powerTip.e:after { + border-left-color: #fff; + border-width: 10px; + top: 50%; + margin-top: -10px +} +#powerTip.e:before { + border-left-color: gray; + border-width: 11px; + top: 50%; + margin-top: -11px +} +#powerTip.w:after, +#powerTip.w:before { + right: 100% +} +#powerTip.w:after { + border-right-color: #fff; + border-width: 10px; + top: 50%; + margin-top: -10px +} +#powerTip.w:before { + border-right-color: gray; + border-width: 11px; + top: 50%; + margin-top: -11px +} +@media print { + #nav-path, + #side-nav, + #top { + display: none + } + body { + overflow: visible + } + h1, + h2, + h3, + h4, + h5, + h6 { + page-break-after: avoid + } + .summary { + display: none + } + .memitem { + page-break-inside: avoid + } + #doc-content { + margin-left: 0!important; + height: auto!important; + width: auto!important; + overflow: inherit; + display: inline + } +} +body, +input { + font-family: Open Sans, Helvetica, sans-serif; + color: #323d47; + background: #ebebeb +} +a { + color: #4665a2 +} +#projectname, +.title, +h1, +h2 { + font-family: Contax Pro, HelveticaNeue, Helvetica Neue, HelveticaNeueRoman, HelveticaNeue-Roman, Helvetica Neue Roman, Helvetica, Tahoma, Geneva, Arial, sans-serif; + font-weight: 900; +} +#projectname, +.title { + font-size: 32px +} +h1 { + font-size: 24px; +} +h2 { + font-size: 20px; +} +hr { + border-top: 1px solid #f59cad +} +#projectname { + padding-left: 20px +} +#MSearchField { + padding: 0 0 0 .5em; + font-size: 1em +} +#MSearchSelectWindow { + border: 1px solid #f59cad +} +a.SelectItem:hover { + background: #ebebeb; + color: #000 +} +#MSearchResultsWindow { + background: #fbfbfb; + border-radius: 3px +} +#nav-tree { + padding-left: 20px +} +#nav-tree .selected { + font-weight: 700 +} +.arrow { + color: #d1d3d3 +} +.item:hover>a>.arrow { + color: #aaaeae +} +.ui-resizable-e { + border-style: solid; + border-width: 0 1px; + border-color: #dcd9d9 +} +.ui-resizable-e:before { + content: ''; + display: block; + position: absolute; + top: 50%; + margin-top: -8px; + width: 3px; + height: 3px; + border-style: double; + border-width: 6px 0; + border-color: #ebebeb; + margin-left: 2px +} +div.header { + background: #ebebeb; + border: 0 +} +h2.groupheader { + color: #000; + border-bottom: 1px solid #f59cad +} +.memSeparator { + border-bottom: 1px solid #f8ccd4 +} +/*# sourceMappingURL=doxygen.css.map*/ + +div.image img[src="BlocksMonitor.png"] { + width: 750px; +} +div.image img[src="BlocksDrawing_palette.JPG"] { + width: 320px; +} +div.image img[src="BlocksDrawing_canvas.JPG"] { + width: 320px; +} +div.image img[src="BlocksSynth_grid.JPG"] { + width: 320px; +} +div.image img[src="BlocksSynth_waveshape.gif"] { + width: 320px; +} diff --git a/extras/BLOCKS/juce_modules.txt b/extras/BLOCKS/juce_modules.txt new file mode 100644 index 00000000..ee38d54a --- /dev/null +++ b/extras/BLOCKS/juce_modules.txt @@ -0,0 +1,5 @@ +juce_audio_basics +juce_audio_devices +juce_blocks_basics +juce_core +juce_events diff --git a/extras/BLOCKS/standalone_sdk/README.md b/extras/BLOCKS/standalone_sdk/README.md new file mode 100644 index 00000000..18d658e9 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/README.md @@ -0,0 +1,4 @@ +# The BLOCKS SDK + +Documentation can be found at http://developer.roli.com/documentation/the_standalone_blocks_sdk.html + diff --git a/extras/BLOCKS/standalone_sdk/SDK/BlocksHeader.h b/extras/BLOCKS/standalone_sdk/SDK/BlocksHeader.h new file mode 100644 index 00000000..e3aba253 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/SDK/BlocksHeader.h @@ -0,0 +1,18 @@ +#ifndef JUCEHEADER_INCLUDED +#define JUCEHEADER_INCLUDED + +#ifndef JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED +#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 +#endif + +#ifndef JUCE_DONT_DECLARE_PROJECTINFO +#define JUCE_DONT_DECLARE_PROJECTINFO 1 +#endif + +#include +#include +#include +#include +#include + +#endif // JUCEHEADER_INCLUDED diff --git a/extras/BLOCKS/standalone_sdk/SDK/Build/Linux/Makefile b/extras/BLOCKS/standalone_sdk/SDK/Build/Linux/Makefile new file mode 100644 index 00000000..c54b9113 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/SDK/Build/Linux/Makefile @@ -0,0 +1,46 @@ +ifndef AR + AR := ar +endif + +ifndef CONFIG + CONFIG := Debug +endif + +TARGET := libBLOCKS-SDK.a + +JUCE_OUTDIR := $(CONFIG) +JUCE_OBJDIR := build/$(CONFIG) + +JUCE_INCLUDES := -I../.. +JUCE_SDKDEFINES := -DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1 -DJUCE_STANDALONE_APPLICATION=1 +JUCE_CXXFLAGS = -std=c++11 $(DEPFLAGS) -march=native -DLINUX=1 $(JUCE_SDKDEFINES) $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama) -pthread $(JUCE_INCLUDES) + +ifeq ($(CONFIG),Debug) + JUCE_CXXFLAGS += -DDEBUG=1 -D_DEBUG=1 -g -ggdb -O0 +endif + +ifeq ($(CONFIG),Release) + JUCE_CXXFLAGS += -DNDEBUG=1 -Os +endif + +JUCE_MODULES := juce_audio_basics juce_audio_devices juce_blocks_basics juce_core juce_events +JUCE_SOURCE := $(foreach MODULE_NAME,$(JUCE_MODULES),../../$(MODULE_NAME)/$(MODULE_NAME).cpp) +JUCE_OBJECTS := $(foreach MODULE_NAME,$(JUCE_MODULES),$(JUCE_OBJDIR)/$(MODULE_NAME)/$(MODULE_NAME).o) + +.PHONY: clean + +$(JUCE_OUTDIR)/$(TARGET): check-pkg-config $(JUCE_OBJECTS) + @mkdir -p $(JUCE_OUTDIR) + $(AR) -cr $@ $(JUCE_OBJECTS) + +check-pkg-config: + @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama + +clean: + rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) + +$(JUCE_OBJDIR)/%.o: ../../%.cpp + -@mkdir -p $(dir $@) + $(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + diff --git a/extras/BLOCKS/standalone_sdk/SDK/Build/MacOS/BLOCKS-SDK.xcodeproj/project.pbxproj b/extras/BLOCKS/standalone_sdk/SDK/Build/MacOS/BLOCKS-SDK.xcodeproj/project.pbxproj new file mode 100644 index 00000000..c4588d92 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/SDK/Build/MacOS/BLOCKS-SDK.xcodeproj/project.pbxproj @@ -0,0 +1,299 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + E2F016B31DB93C320054ECA4 /* juce_audio_basics.mm in Sources */ = {isa = PBXBuildFile; fileRef = E2F016B21DB93C320054ECA4 /* juce_audio_basics.mm */; }; + E2F016B51DB93C3D0054ECA4 /* juce_audio_devices.mm in Sources */ = {isa = PBXBuildFile; fileRef = E2F016B41DB93C3D0054ECA4 /* juce_audio_devices.mm */; }; + E2F016B71DB93C480054ECA4 /* juce_blocks_basics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E2F016B61DB93C480054ECA4 /* juce_blocks_basics.cpp */; }; + E2F016B91DB93C540054ECA4 /* juce_core.mm in Sources */ = {isa = PBXBuildFile; fileRef = E2F016B81DB93C540054ECA4 /* juce_core.mm */; }; + E2F016BB1DB93C5C0054ECA4 /* juce_events.mm in Sources */ = {isa = PBXBuildFile; fileRef = E2F016BA1DB93C5C0054ECA4 /* juce_events.mm */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + E2BD1B8A1DB62B4000C4F301 /* libBLOCKS-SDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libBLOCKS-SDK.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + E2F016B21DB93C320054ECA4 /* juce_audio_basics.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_audio_basics.mm; path = ../../juce_audio_basics/juce_audio_basics.mm; sourceTree = ""; }; + E2F016B41DB93C3D0054ECA4 /* juce_audio_devices.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_audio_devices.mm; path = ../../juce_audio_devices/juce_audio_devices.mm; sourceTree = ""; }; + E2F016B61DB93C480054ECA4 /* juce_blocks_basics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = juce_blocks_basics.cpp; path = ../../juce_blocks_basics/juce_blocks_basics.cpp; sourceTree = ""; }; + E2F016B81DB93C540054ECA4 /* juce_core.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_core.mm; path = ../../juce_core/juce_core.mm; sourceTree = ""; }; + E2F016BA1DB93C5C0054ECA4 /* juce_events.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_events.mm; path = ../../juce_events/juce_events.mm; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + E2BD1B871DB62B4000C4F301 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + E2BD1B811DB62B4000C4F301 = { + isa = PBXGroup; + children = ( + E2F016B21DB93C320054ECA4 /* juce_audio_basics.mm */, + E2F016B41DB93C3D0054ECA4 /* juce_audio_devices.mm */, + E2F016B61DB93C480054ECA4 /* juce_blocks_basics.cpp */, + E2F016B81DB93C540054ECA4 /* juce_core.mm */, + E2F016BA1DB93C5C0054ECA4 /* juce_events.mm */, + E2BD1B8B1DB62B4000C4F301 /* Products */, + ); + sourceTree = ""; + }; + E2BD1B8B1DB62B4000C4F301 /* Products */ = { + isa = PBXGroup; + children = ( + E2BD1B8A1DB62B4000C4F301 /* libBLOCKS-SDK.a */, + ); + name = Products; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + E2BD1B881DB62B4000C4F301 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + E2BD1B891DB62B4000C4F301 /* BLOCKS-SDK */ = { + isa = PBXNativeTarget; + buildConfigurationList = E2BD1B8E1DB62B4000C4F301 /* Build configuration list for PBXNativeTarget "BLOCKS-SDK" */; + buildPhases = ( + E2BD1B861DB62B4000C4F301 /* Sources */, + E2BD1B871DB62B4000C4F301 /* Frameworks */, + E2BD1B881DB62B4000C4F301 /* Headers */, + E2ECDF741DB62D7E006D016F /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "BLOCKS-SDK"; + productName = "BLOCKS-SDK"; + productReference = E2BD1B8A1DB62B4000C4F301 /* libBLOCKS-SDK.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + E2BD1B821DB62B4000C4F301 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0800; + ORGANIZATIONNAME = "ROLI Ltd."; + TargetAttributes = { + E2BD1B891DB62B4000C4F301 = { + CreatedOnToolsVersion = 8.0; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = E2BD1B851DB62B4000C4F301 /* Build configuration list for PBXProject "BLOCKS-SDK" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = E2BD1B811DB62B4000C4F301; + productRefGroup = E2BD1B8B1DB62B4000C4F301 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + E2BD1B891DB62B4000C4F301 /* BLOCKS-SDK */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXShellScriptBuildPhase section */ + E2ECDF741DB62D7E006D016F /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "mkdir -p ${PROJECT_DIR}/${CONFIGURATION}\ncp ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_NAME} ${PROJECT_DIR}/${CONFIGURATION}"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + E2BD1B861DB62B4000C4F301 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E2F016B31DB93C320054ECA4 /* juce_audio_basics.mm in Sources */, + E2F016B51DB93C3D0054ECA4 /* juce_audio_devices.mm in Sources */, + E2F016B71DB93C480054ECA4 /* juce_blocks_basics.cpp in Sources */, + E2F016B91DB93C540054ECA4 /* juce_core.mm in Sources */, + E2F016BB1DB93C5C0054ECA4 /* juce_events.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + E2BD1B8C1DB62B4000C4F301 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + E2BD1B8D1DB62B4000C4F301 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + }; + name = Release; + }; + E2BD1B8F1DB62B4000C4F301 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = NO; + CLANG_WARN_DOCUMENTATION_COMMENTS = NO; + EXECUTABLE_PREFIX = lib; + GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", + "DEBUG=1", + ); + GCC_WARN_UNDECLARED_SELECTOR = NO; + HEADER_SEARCH_PATHS = ../..; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = ""; + }; + name = Debug; + }; + E2BD1B901DB62B4000C4F301 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = NO; + CLANG_WARN_DOCUMENTATION_COMMENTS = NO; + EXECUTABLE_PREFIX = lib; + GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", + "NDEBUG=1", + ); + GCC_WARN_UNDECLARED_SELECTOR = NO; + HEADER_SEARCH_PATHS = ../..; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = ""; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + E2BD1B851DB62B4000C4F301 /* Build configuration list for PBXProject "BLOCKS-SDK" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E2BD1B8C1DB62B4000C4F301 /* Debug */, + E2BD1B8D1DB62B4000C4F301 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + E2BD1B8E1DB62B4000C4F301 /* Build configuration list for PBXNativeTarget "BLOCKS-SDK" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E2BD1B8F1DB62B4000C4F301 /* Debug */, + E2BD1B901DB62B4000C4F301 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = E2BD1B821DB62B4000C4F301 /* Project object */; +} diff --git a/extras/BLOCKS/standalone_sdk/SDK/Build/Windows/BLOCKS-SDK.sln b/extras/BLOCKS/standalone_sdk/SDK/Build/Windows/BLOCKS-SDK.sln new file mode 100644 index 00000000..20a24377 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/SDK/Build/Windows/BLOCKS-SDK.sln @@ -0,0 +1,28 @@ +ï»¿ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BLOCKS-SDK", "BLOCKS-SDK.vcxproj", "{6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Debug|x64.ActiveCfg = Debug|x64 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Debug|x64.Build.0 = Debug|x64 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Debug|x86.ActiveCfg = Debug|Win32 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Debug|x86.Build.0 = Debug|Win32 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Release|x64.ActiveCfg = Release|x64 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Release|x64.Build.0 = Release|x64 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Release|x86.ActiveCfg = Release|Win32 + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/extras/BLOCKS/standalone_sdk/SDK/Build/Windows/BLOCKS-SDK.vcxproj b/extras/BLOCKS/standalone_sdk/SDK/Build/Windows/BLOCKS-SDK.vcxproj new file mode 100644 index 00000000..b4e5567e --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/SDK/Build/Windows/BLOCKS-SDK.vcxproj @@ -0,0 +1,150 @@ +ï»¿ + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + {6EE7FF54-2573-4A5F-BF4A-9654DC2C580B} + Win32Proj + BLOCKSSDK + 8.1 + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + NotUsing + Level3 + Disabled + JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\.. + + + Windows + + + + + NotUsing + Level3 + Disabled + JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\.. + + + Windows + + + + + + + + + Level3 + NotUsing + MaxSpeed + true + true + JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\.. + + + Windows + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\.. + + + Windows + true + true + + + + + + + + + + \ No newline at end of file diff --git a/extras/BLOCKS/standalone_sdk/create_standalone_sdk.py b/extras/BLOCKS/standalone_sdk/create_standalone_sdk.py new file mode 100644 index 00000000..7b0b1324 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/create_standalone_sdk.py @@ -0,0 +1,36 @@ +import os +import shutil + +script_dir = os.path.dirname(os.path.realpath(__file__)) + +# Get the list of JUCE modules to include. +juce_modules = [] +with open(os.path.join(script_dir, "..", "juce_modules.txt"), "r") as f: + for line in f: + juce_modules.append(line.strip()) + +# Make sure we are starting afresh. +out_directory = "BLOCKS-SDK" +try: + shutil.rmtree(out_directory) +except OSError as e: + if e.errno != 2: + # An errno of 2 indicates that the directory does not exist, which is + # fine! + raise e + +# Copy the required modules into the SDK dir. +sdk_dir = os.path.join(out_directory, "SDK") +shutil.copytree(os.path.join(script_dir, "SDK"), sdk_dir) +for module_name in juce_modules: + shutil.copytree(os.path.join(script_dir, "..", "..", "..", "modules", + module_name), + os.path.join(sdk_dir, module_name)) + +# Copy the examples. +shutil.copytree(os.path.join(script_dir, "examples"), + os.path.join(out_directory, "examples")) + +# Copy the README. +shutil.copyfile(os.path.join(script_dir, "README.md"), + os.path.join(out_directory, "README.md")) diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/BlockFinder.cpp b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/BlockFinder.cpp new file mode 100644 index 00000000..ffc6b39a --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/BlockFinder.cpp @@ -0,0 +1,29 @@ +#include "BlockFinder.h" + +using namespace juce; + +BlockFinder::BlockFinder() +{ + // Register to receive topologyChanged() callbacks from pts. + pts.addListener (this); +} + +void BlockFinder::topologyChanged() +{ + // We have a new topology, so find out what it isand store it in a local + // variable. + BlockTopology currentTopology = pts.getCurrentTopology(); + Logger::writeToLog ("\nNew BLOCKS topology."); + + // The blocks member of a BlockTopology contains an array of blocks. Here we + // loop over them and print some information. + Logger::writeToLog (String ("Detected ") + String (currentTopology.blocks.size()) + " blocks:"); + for (auto& block : currentTopology.blocks) + { + Logger::writeToLog (""); + Logger::writeToLog (String(" Description: ") + block->getDeviceDescription()); + Logger::writeToLog (String(" Battery level: ") + String (block->getBatteryLevel())); + Logger::writeToLog (String(" UID: ") + String (block->uid)); + Logger::writeToLog (String(" Serial number: ") + block->serialNumber); + } +} diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/BlockFinder.h b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/BlockFinder.h new file mode 100644 index 00000000..ba03c41f --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/BlockFinder.h @@ -0,0 +1,23 @@ +#ifndef BLOCKFINDER_INCLUDED +#define BLOCKFINDER_INCLUDED + +#include + +// Monitors a PhysicalTopologySource for changes to the connected BLOCKS and +// prints some information about the BLOCKS that are available. +class BlockFinder : private juce::TopologySource::Listener +{ +public: + // Register as a listener to the PhysicalTopologySource, so that we receive + // callbacks in topologyChanged(). + BlockFinder(); + +private: + // Called by the PhysicalTopologySource when the BLOCKS topology changes. + void topologyChanged() override; + + // The PhysicalTopologySource member variable which reports BLOCKS changes. + juce::PhysicalTopologySource pts; +}; + +#endif // BLOCKFINDER_INCLUDED diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Linux/Makefile b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Linux/Makefile new file mode 100644 index 00000000..1474023b --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Linux/Makefile @@ -0,0 +1,72 @@ +ifeq ($(shell uname),Darwin) + PLATFORM = MacOS +else + PLATFORM = Linux +endif + +# C++ compiler. +CXX := g++ -std=c++11 + +# Build configuration (Debug or Release). +ifndef CONFIG + CONFIG := Debug +endif +ifeq ($(CONFIG),Debug) + CXXFLAGS += -O0 -g -DDEBUG=1 -D_DEBUG=1 +else + CXXFLAGS += -O3 -DNDEBUG +endif + +# The name of your application. +APP_NAME := BlockFinder + +# The path to the modules directory in the BLOCKS SDK directory. +SDK_PATH := ../../../SDK + +# The path to temporary build files. +OBJECT_DIR := build/$(CONFIG) + +# The path to the compiled BLOCKSSDK library. +BLOCKS_LIBRARY := $(SDK_PATH)/Build/$(PLATFORM)/$(CONFIG)/libBLOCKS-SDK.a + +# The source code for this application. +SOURCE_FILES := $(wildcard ../*.cpp) $(foreach EXT,.cpp .mm,$(wildcard *$(EXT))) + +# Make a list of object files from .cpp files. +SOURCE_OBJ := $(addprefix $(OBJECT_DIR)/,$(notdir $(addsuffix .o,$(basename $(SOURCE_FILES))))) + +# Header include paths (prefix with -I). +INCLUDES := -I$(SDK_PATH) + +# Frameworks and libraries. +ifeq ($(PLATFORM),MacOS) + LIBS := -framework Accelerate -framework AudioToolbox -framework Carbon -framework Cocoa -framework CoreAudio -framework CoreMIDI -framework IOKit -framework OpenGL -framework QuartzCore +else + LIBS := -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa libcurl x11) -ldl -lpthread -lrt + CXXFLAGS += -DLINUX=1 +endif + +############################################################################## +# Build rules # +############################################################################## + +.PHONEY: clean + +$(CONFIG)/$(APP_NAME): $(SOURCE_OBJ) $(BLOCKS_LIBRARY) + @mkdir -p $(dir $@) + $(CXX) $^ -o $@ $(LIBS) + +$(OBJECT_DIR)/%.o: ../%.cpp + @mkdir -p $(dir $@) + $(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ -c $< + +$(OBJECT_DIR)/%.o: %.cpp + @mkdir -p $(dir $@) + $(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ -c $< + +$(OBJECT_DIR)/%.o: %.mm + @mkdir -p $(dir $@) + $(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ -c $< + +clean: + rm -rf $(CONFIG) $(OBJECT_DIR) diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Linux/main.cpp b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Linux/main.cpp new file mode 100644 index 00000000..091903e4 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Linux/main.cpp @@ -0,0 +1,28 @@ +#include "../BlockFinder.h" + +// A simple JUCE app containing our BlockFinder. This is a quick way of +// setting up an event loop so we can receive Block topology change events. +class MyJUCEApp : public juce::JUCEApplicationBase +{ +public: + MyJUCEApp() {} + ~MyJUCEApp() {} + void initialise (const juce::String&) override {} + void shutdown() override {} + const juce::String getApplicationName() override { return "BlockFinder"; } + const juce::String getApplicationVersion() override { return "1.0.0"; } + bool moreThanOneInstanceAllowed() override { return true; } + void anotherInstanceStarted (const juce::String&) override {} + void suspended() override {} + void resumed() override {} + void systemRequestedQuit() override {} + void unhandledException(const std::exception*, const juce::String&, + int lineNumber) override {} + +private: + + // Our BLOCKS class. + BlockFinder finder; +}; + +START_JUCE_APPLICATION (MyJUCEApp) diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/BlockFinder.xcodeproj/project.pbxproj b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/BlockFinder.xcodeproj/project.pbxproj new file mode 100644 index 00000000..6015f213 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/BlockFinder.xcodeproj/project.pbxproj @@ -0,0 +1,316 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + E232CCB11DB8CCEA00276BB3 /* BlockFinder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E232CCAF1DB8CCEA00276BB3 /* BlockFinder.cpp */; }; + E242E7661DB77E9D0022D78D /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = E242E7651DB77E9D0022D78D /* main.mm */; }; + E2E162A21DBA6DF60049A6D5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2ECDFC41DB6864E006D016F /* Cocoa.framework */; }; + E2E162A41DBA6F160049A6D5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2ECDFC21DB6864E006D016F /* AudioToolbox.framework */; }; + E2ECDFC01DB685D2006D016F /* libBLOCKS-SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E2ECDFBF1DB685D2006D016F /* libBLOCKS-SDK.a */; }; + E2ECDFCA1DB6864E006D016F /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2ECDFC11DB6864E006D016F /* Accelerate.framework */; }; + E2ECDFCE1DB6864E006D016F /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2ECDFC51DB6864E006D016F /* CoreAudio.framework */; }; + E2ECDFCF1DB6864E006D016F /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2ECDFC61DB6864E006D016F /* CoreMIDI.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + E2ECDFB01DB684F9006D016F /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + ); + runOnlyForDeploymentPostprocessing = 1; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + E232CCAF1DB8CCEA00276BB3 /* BlockFinder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BlockFinder.cpp; path = ../BlockFinder.cpp; sourceTree = ""; }; + E232CCB01DB8CCEA00276BB3 /* BlockFinder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BlockFinder.h; path = ../BlockFinder.h; sourceTree = ""; }; + E242E7651DB77E9D0022D78D /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = ""; }; + E2ECDFB21DB684F9006D016F /* BlockFinder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = BlockFinder; sourceTree = BUILT_PRODUCTS_DIR; }; + E2ECDFBF1DB685D2006D016F /* libBLOCKS-SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libBLOCKS-SDK.a"; path = "../../../../SDK/Build/MacOS/Debug/libBLOCKS-SDK.a"; sourceTree = ""; }; + E2ECDFC11DB6864E006D016F /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; + E2ECDFC21DB6864E006D016F /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + E2ECDFC31DB6864E006D016F /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; + E2ECDFC41DB6864E006D016F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + E2ECDFC51DB6864E006D016F /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; + E2ECDFC61DB6864E006D016F /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; }; + E2ECDFC71DB6864E006D016F /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + E2ECDFC81DB6864E006D016F /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; + E2ECDFC91DB6864E006D016F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + E2ECDFAF1DB684F9006D016F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + E2E162A41DBA6F160049A6D5 /* AudioToolbox.framework in Frameworks */, + E2E162A21DBA6DF60049A6D5 /* Cocoa.framework in Frameworks */, + E2ECDFCA1DB6864E006D016F /* Accelerate.framework in Frameworks */, + E2ECDFCE1DB6864E006D016F /* CoreAudio.framework in Frameworks */, + E2ECDFCF1DB6864E006D016F /* CoreMIDI.framework in Frameworks */, + E2ECDFC01DB685D2006D016F /* libBLOCKS-SDK.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + E2ECDFA91DB684F9006D016F = { + isa = PBXGroup; + children = ( + E232CCAF1DB8CCEA00276BB3 /* BlockFinder.cpp */, + E232CCB01DB8CCEA00276BB3 /* BlockFinder.h */, + E242E7651DB77E9D0022D78D /* main.mm */, + E2ECDFB31DB684F9006D016F /* Products */, + E2ECDFBE1DB685D2006D016F /* Frameworks */, + ); + sourceTree = ""; + }; + E2ECDFB31DB684F9006D016F /* Products */ = { + isa = PBXGroup; + children = ( + E2ECDFB21DB684F9006D016F /* BlockFinder */, + ); + name = Products; + sourceTree = ""; + }; + E2ECDFBE1DB685D2006D016F /* Frameworks */ = { + isa = PBXGroup; + children = ( + E2ECDFC11DB6864E006D016F /* Accelerate.framework */, + E2ECDFC21DB6864E006D016F /* AudioToolbox.framework */, + E2ECDFC31DB6864E006D016F /* Carbon.framework */, + E2ECDFC41DB6864E006D016F /* Cocoa.framework */, + E2ECDFC51DB6864E006D016F /* CoreAudio.framework */, + E2ECDFC61DB6864E006D016F /* CoreMIDI.framework */, + E2ECDFC71DB6864E006D016F /* IOKit.framework */, + E2ECDFC81DB6864E006D016F /* OpenGL.framework */, + E2ECDFC91DB6864E006D016F /* QuartzCore.framework */, + E2ECDFBF1DB685D2006D016F /* libBLOCKS-SDK.a */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + E2ECDFB11DB684F9006D016F /* BlockFinder */ = { + isa = PBXNativeTarget; + buildConfigurationList = E2ECDFB91DB684F9006D016F /* Build configuration list for PBXNativeTarget "BlockFinder" */; + buildPhases = ( + E2ECDFAE1DB684F9006D016F /* Sources */, + E2ECDFAF1DB684F9006D016F /* Frameworks */, + E2ECDFB01DB684F9006D016F /* CopyFiles */, + E2ECDFD31DB6872A006D016F /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = BlockFinder; + productName = BlocksMonitor; + productReference = E2ECDFB21DB684F9006D016F /* BlockFinder */; + productType = "com.apple.product-type.tool"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + E2ECDFAA1DB684F9006D016F /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0800; + ORGANIZATIONNAME = "ROLI Ltd."; + TargetAttributes = { + E2ECDFB11DB684F9006D016F = { + CreatedOnToolsVersion = 8.0; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = E2ECDFAD1DB684F9006D016F /* Build configuration list for PBXProject "BlockFinder" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = E2ECDFA91DB684F9006D016F; + productRefGroup = E2ECDFB31DB684F9006D016F /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + E2ECDFB11DB684F9006D016F /* BlockFinder */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXShellScriptBuildPhase section */ + E2ECDFD31DB6872A006D016F /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "mkdir -p ${PROJECT_DIR}/${CONFIGURATION}\ncp ${BUILT_PRODUCTS_DIR}/${EXECUTABLE_NAME} ${PROJECT_DIR}/${CONFIGURATION}"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + E2ECDFAE1DB684F9006D016F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E242E7661DB77E9D0022D78D /* main.mm in Sources */, + E232CCB11DB8CCEA00276BB3 /* BlockFinder.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + E2ECDFB71DB684F9006D016F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + E2ECDFB81DB684F9006D016F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + }; + name = Release; + }; + E2ECDFBA1DB684F9006D016F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_DOCUMENTATION_COMMENTS = NO; + HEADER_SEARCH_PATHS = ../../../SDK; + LIBRARY_SEARCH_PATHS = "../../../SDK/Build/MacOS/${CONFIGURATION}"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + E2ECDFBB1DB684F9006D016F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_WARN_DOCUMENTATION_COMMENTS = NO; + GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; + HEADER_SEARCH_PATHS = ../../../SDK; + LIBRARY_SEARCH_PATHS = "../../../SDK/Build/MacOS/${CONFIGURATION}"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + E2ECDFAD1DB684F9006D016F /* Build configuration list for PBXProject "BlockFinder" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E2ECDFB71DB684F9006D016F /* Debug */, + E2ECDFB81DB684F9006D016F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + E2ECDFB91DB684F9006D016F /* Build configuration list for PBXNativeTarget "BlockFinder" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E2ECDFBA1DB684F9006D016F /* Debug */, + E2ECDFBB1DB684F9006D016F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = E2ECDFAA1DB684F9006D016F /* Project object */; +} diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/Makefile b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/Makefile new file mode 100644 index 00000000..507a13b7 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/Makefile @@ -0,0 +1,72 @@ +ifeq ($(shell uname),Darwin) + PLATFORM = MacOS +else + PLATFORM = Linux +endif + +# C++ compiler. +CXX := g++ -std=c++11 + +# Build configuration (Debug or Release). +ifndef CONFIG + CONFIG := Debug +endif +ifeq ($(CONFIG),Debug) + CXXFLAGS += -O0 -g -DDEBUG=1 -D_DEBUG=1 +else + CXXFLAGS += -O3 -DNDEBUG +endif + +# The name of your application. +APP_NAME := BlockFinder + +# The path to the modules directory in the BLOCKS SDK directory. +SDK_PATH := ../../../SDK + +# The path to temporary build files. +OBJECT_DIR := build/$(CONFIG) + +# The path to the compiled BLOCKSSDK library. +BLOCKS_LIBRARY := $(SDK_PATH)/Build/$(PLATFORM)/$(CONFIG)/libBLOCKS-SDK.a + +# The source code for this application. +SOURCE_FILES := $(wildcard ../*.cpp) $(foreach EXT,.cpp .mm,$(wildcard *$(EXT))) + +# Make a list of object files from .cpp files. +SOURCE_OBJ := $(addprefix $(OBJECT_DIR)/,$(notdir $(addsuffix .o,$(basename $(SOURCE_FILES))))) + +# Header include paths (prefix with -I). +INCLUDES := -I$(SDK_PATH) + +# Frameworks and libraries. +ifeq ($(PLATFORM),MacOS) + LIBS := -framework Accelerate -framework AudioToolbox -framework Carbon -framework Cocoa -framework CoreAudio -framework CoreMIDI -framework IOKit -framework OpenGL -framework QuartzCore +else + LIBS := -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama) -lGL -ldl -lpthread -lrt + CXXFLAGS += -DLINUX=1 +endif + +############################################################################## +# Build rules # +############################################################################## + +.PHONEY: clean + +$(CONFIG)/$(APP_NAME): $(SOURCE_OBJ) $(BLOCKS_LIBRARY) + @mkdir -p $(dir $@) + $(CXX) $^ -o $@ $(LIBS) + +$(OBJECT_DIR)/%.o: ../%.cpp + @mkdir -p $(dir $@) + $(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ -c $< + +$(OBJECT_DIR)/%.o: %.cpp + @mkdir -p $(dir $@) + $(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ -c $< + +$(OBJECT_DIR)/%.o: %.mm + @mkdir -p $(dir $@) + $(CXX) $(CXXFLAGS) $(INCLUDES) -o $@ -c $< + +clean: + rm -rf $(CONFIG) $(OBJECT_DIR) diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/main.mm b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/main.mm new file mode 100644 index 00000000..7614ccfc --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/MacOS/main.mm @@ -0,0 +1,17 @@ +#include "../BlockFinder.h" + +#import + +int main (int argc, const char * argv[]) +{ + // Initialise the JUCE code. + juce::ScopedJuceInitialiser_GUI platform; + + // Create our JUCE object. + BlockFinder finder; + + // Run an event loop. + while ([[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]]); + + return 0; +} diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.sln b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.sln new file mode 100644 index 00000000..489f4465 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.sln @@ -0,0 +1,28 @@ +ï»¿ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlockFinder", "BlockFinder.vcxproj", "{881F9AC3-2B1A-4867-92AF-125332B5A87A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {881F9AC3-2B1A-4867-92AF-125332B5A87A}.Debug|x64.ActiveCfg = Debug|x64 + {881F9AC3-2B1A-4867-92AF-125332B5A87A}.Debug|x64.Build.0 = Debug|x64 + {881F9AC3-2B1A-4867-92AF-125332B5A87A}.Debug|x86.ActiveCfg = Debug|Win32 + {881F9AC3-2B1A-4867-92AF-125332B5A87A}.Debug|x86.Build.0 = Debug|Win32 + {881F9AC3-2B1A-4867-92AF-125332B5A87A}.Release|x64.ActiveCfg = Release|x64 + {881F9AC3-2B1A-4867-92AF-125332B5A87A}.Release|x64.Build.0 = Release|x64 + {881F9AC3-2B1A-4867-92AF-125332B5A87A}.Release|x86.ActiveCfg = Release|Win32 + {881F9AC3-2B1A-4867-92AF-125332B5A87A}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.vcxproj b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.vcxproj new file mode 100644 index 00000000..52023e29 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/BlockFinder.vcxproj @@ -0,0 +1,166 @@ +ï»¿ + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {881F9AC3-2B1A-4867-92AF-125332B5A87A} + Win32Proj + BlockFinder + 8.1 + + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + ..\..\..\SDK + + + Windows + true + BLOCKS-SDK.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\..\SDK\Build\Windows\$(Configuration) + + + + + + + Level3 + Disabled + _DEBUG;_WINDOWS;%(PreprocessorDefinitions) + ..\..\..\SDK + + + Windows + true + BLOCKS-SDK.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\..\SDK\Build\Windows\x64\$(Configuration) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + ..\..\..\SDK + + + Windows + true + true + true + BLOCKS-SDK.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\..\SDK\Build\Windows\$(Configuration) + + + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + ..\..\..\SDK + + + Windows + true + true + true + BLOCKS-SDK.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\..\SDK\Build\Windows\x64\$(Configuration) + + + + + + + + + + + + + \ No newline at end of file diff --git a/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/main.cpp b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/main.cpp new file mode 100644 index 00000000..091903e4 --- /dev/null +++ b/extras/BLOCKS/standalone_sdk/examples/BlockFinder/Windows/main.cpp @@ -0,0 +1,28 @@ +#include "../BlockFinder.h" + +// A simple JUCE app containing our BlockFinder. This is a quick way of +// setting up an event loop so we can receive Block topology change events. +class MyJUCEApp : public juce::JUCEApplicationBase +{ +public: + MyJUCEApp() {} + ~MyJUCEApp() {} + void initialise (const juce::String&) override {} + void shutdown() override {} + const juce::String getApplicationName() override { return "BlockFinder"; } + const juce::String getApplicationVersion() override { return "1.0.0"; } + bool moreThanOneInstanceAllowed() override { return true; } + void anotherInstanceStarted (const juce::String&) override {} + void suspended() override {} + void resumed() override {} + void systemRequestedQuit() override {} + void unhandledException(const std::exception*, const juce::String&, + int lineNumber) override {} + +private: + + // Our BLOCKS class. + BlockFinder finder; +}; + +START_JUCE_APPLICATION (MyJUCEApp) diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile index c084a0b2..b5b3cb88 100644 --- a/extras/Projucer/Builds/LinuxMakefile/Makefile +++ b/extras/Projucer/Builds/LinuxMakefile/Makefile @@ -26,7 +26,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.4 -DJUCE_APP_VERSION_HEX=0x40204 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt @@ -46,7 +46,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.2.4 -DJUCE_APP_VERSION_HEX=0x40204 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt @@ -61,6 +61,7 @@ OBJECTS := \ $(JUCE_OBJDIR)/jucer_AutoUpdater_ca658dc2.o \ $(JUCE_OBJDIR)/jucer_CommandLine_f35de107.o \ $(JUCE_OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o \ + $(JUCE_OBJDIR)/jucer_DownloadCompileEngineThread_8a38703f.o \ $(JUCE_OBJDIR)/jucer_GlobalPreferences_b0f1bd3d.o \ $(JUCE_OBJDIR)/jucer_Main_f8488f5b.o \ $(JUCE_OBJDIR)/jucer_MainWindow_1e163aeb.o \ @@ -154,6 +155,11 @@ $(JUCE_OBJDIR)/jucer_DocumentEditorComponent_695dff1d.o: ../../Source/Applicatio @echo "Compiling jucer_DocumentEditorComponent.cpp" @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" +$(JUCE_OBJDIR)/jucer_DownloadCompileEngineThread_8a38703f.o: ../../Source/Application/jucer_DownloadCompileEngineThread.cpp + -@mkdir -p $(JUCE_OBJDIR) + @echo "Compiling jucer_DownloadCompileEngineThread.cpp" + @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(JUCE_OBJDIR)/jucer_GlobalPreferences_b0f1bd3d.o: ../../Source/Application/jucer_GlobalPreferences.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling jucer_GlobalPreferences.cpp" diff --git a/extras/Projucer/Builds/MacOSX/Info-App.plist b/extras/Projucer/Builds/MacOSX/Info-App.plist index ba12f1b8..2ed1ad41 100644 --- a/extras/Projucer/Builds/MacOSX/Info-App.plist +++ b/extras/Projucer/Builds/MacOSX/Info-App.plist @@ -33,9 +33,9 @@ CFBundleSignature ???? CFBundleShortVersionString - 4.2.4 + 4.3.0 CFBundleVersion - 4.2.4 + 4.3.0 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index 22a8050b..544316ae 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ 6DD9DA1677A6CF789CDAB478 = {isa = PBXBuildFile; fileRef = 0D4D508C638BC74943B9976D; }; 954A036F5DDB375DB23FFB3E = {isa = PBXBuildFile; fileRef = 0400CB0E056A1D840304D2DE; }; 3EB3D569250C4BA4CA9AF578 = {isa = PBXBuildFile; fileRef = C7608A3967D9AB9481848F2B; }; + 636D21BF846031A6A1A7476A = {isa = PBXBuildFile; fileRef = 11EB44786085029106099D01; }; 3C3B0ED6C43FDA3AF76DEE2E = {isa = PBXBuildFile; fileRef = 84DE44680C9D37CDDCD127FF; }; 95B44E6C74B1DED31DBE37EB = {isa = PBXBuildFile; fileRef = 8C52A3DDA62A746AA7A68535; }; AA9D0B8E23F3D87A23DE9F8A = {isa = PBXBuildFile; fileRef = 9069981E414A631B036CC9AC; }; @@ -123,6 +124,7 @@ 09697D1C3F7B90DD33A8090E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_SystemStats.mm"; path = "../../../../modules/juce_core/native/juce_mac_SystemStats.mm"; sourceTree = "SOURCE_ROOT"; }; 09DE066936CF037E9709ADB1 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Projucer.app; sourceTree = "BUILT_PRODUCTS_DIR"; }; 0A596EE5FCD9A05F6A2333BC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdmainct.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jdmainct.c"; sourceTree = "SOURCE_ROOT"; }; + 0B24F292A357ABFD9BCC6D7F = {isa = PBXFileReference; lastKnownFileType = file; name = gradlew; path = ../../Source/BinaryData/gradle/gradlew; sourceTree = "SOURCE_ROOT"; }; 0B96A219A0CFF707E5A13B68 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Fonts.mm"; path = "../../../../modules/juce_graphics/native/juce_mac_Fonts.mm"; sourceTree = "SOURCE_ROOT"; }; 0BDFA0E402BA7E6B366E953C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScrollBar.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ScrollBar.h"; sourceTree = "SOURCE_ROOT"; }; 0BEDB3FD70AB61D3E7891D74 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentListener.cpp"; path = "../../../../modules/juce_gui_basics/components/juce_ComponentListener.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -151,10 +153,12 @@ 11BB370E0CBA3B3548B1DDC7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngtrans.c; path = "../../../../modules/juce_graphics/image_formats/pnglib/pngtrans.c"; sourceTree = "SOURCE_ROOT"; }; 11C55B714FE5D7CAFC35A0C7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ImageEffectFilter.h"; path = "../../../../modules/juce_graphics/effects/juce_ImageEffectFilter.h"; sourceTree = "SOURCE_ROOT"; }; 11DC04468BC6023671017EBF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_NewFileWizard.h"; path = "../../Source/Wizards/jucer_NewFileWizard.h"; sourceTree = "SOURCE_ROOT"; }; + 11EB44786085029106099D01 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_DownloadCompileEngineThread.cpp"; path = "../../Source/Application/jucer_DownloadCompileEngineThread.cpp"; sourceTree = "SOURCE_ROOT"; }; 1241F3A1FCDF100CD75D5E78 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DragAndDrop.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp"; sourceTree = "SOURCE_ROOT"; }; 125CD8A5E5B57840F5154ACD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Viewport.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_Viewport.cpp"; sourceTree = "SOURCE_ROOT"; }; 1268E54178897254E9A8B94C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TextLayout.cpp"; path = "../../../../modules/juce_graphics/fonts/juce_TextLayout.cpp"; sourceTree = "SOURCE_ROOT"; }; 129CDB26CC63D4BC2EB1F2CC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PerformanceCounter.cpp"; path = "../../../../modules/juce_core/time/juce_PerformanceCounter.cpp"; sourceTree = "SOURCE_ROOT"; }; + 129F2DE0FEF154F8F8C7A74E = {isa = PBXFileReference; lastKnownFileType = file.jar; name = "gradle-wrapper.jar"; path = "../../Source/BinaryData/gradle/gradle-wrapper.jar"; sourceTree = "SOURCE_ROOT"; }; 1300F6577D67C5609550A25F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_DialogLookAndFeel.h"; path = "../../Source/Utility/jucer_DialogLookAndFeel.h"; sourceTree = "SOURCE_ROOT"; }; 133F1E428260C5ADDF496DF9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ComponentLayout.cpp"; path = "../../Source/ComponentEditor/jucer_ComponentLayout.cpp"; sourceTree = "SOURCE_ROOT"; }; 1353717582E55D6E4D074BA5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Files.cpp"; path = "../../../../modules/juce_core/native/juce_win32_Files.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -447,6 +451,7 @@ 56E8C48ADDEBD48A49C885CB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SplashScreen.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_SplashScreen.cpp"; sourceTree = "SOURCE_ROOT"; }; 5708CF7899EA21D0B72CDC2A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_BlowFish.cpp"; path = "../../../../modules/juce_cryptography/encryption/juce_BlowFish.cpp"; sourceTree = "SOURCE_ROOT"; }; 5745ECDAA4216EE2AF97E5AF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Button.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_Button.h"; sourceTree = "SOURCE_ROOT"; }; + 576A92E1E0D8F453EC0FEB34 = {isa = PBXFileReference; lastKnownFileType = file.bat; name = gradlew.bat; path = ../../Source/BinaryData/gradle/gradlew.bat; sourceTree = "SOURCE_ROOT"; }; 576D62C0C9C1BA4B7A514721 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_PositionPropertyBase.h"; path = "../../Source/ComponentEditor/properties/jucer_PositionPropertyBase.h"; sourceTree = "SOURCE_ROOT"; }; 578AA1C9D44D2E3AEA5D0278 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImagePreviewComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_ImagePreviewComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 58139D8D454051C59E77609B = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = ../../Source/BinaryData/RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; }; @@ -697,6 +702,7 @@ 98F42686D9DAC974F2514217 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_EditingPanelBase.cpp"; path = "../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp"; sourceTree = "SOURCE_ROOT"; }; 990F2A6080B28137CCE2D7B9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Singleton.h"; path = "../../../../modules/juce_core/memory/juce_Singleton.h"; sourceTree = "SOURCE_ROOT"; }; 99557681178F79E2A803C65C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableShape.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableShape.cpp"; sourceTree = "SOURCE_ROOT"; }; + 996E472B82A75531875A5E38 = {isa = PBXFileReference; lastKnownFileType = file; name = LICENSE; path = ../../Source/BinaryData/gradle/LICENSE; sourceTree = "SOURCE_ROOT"; }; 9992E6950C64322A11E39ADF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectWizard_DLL.h"; path = "../../Source/Wizards/jucer_ProjectWizard_DLL.h"; sourceTree = "SOURCE_ROOT"; }; 999BC36BBD71BD4117EFDFC4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BubbleComponent.h"; path = "../../../../modules/juce_gui_basics/misc/juce_BubbleComponent.h"; sourceTree = "SOURCE_ROOT"; }; 99A9C369D8595E72707E866C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XmlDocument.h"; path = "../../../../modules/juce_core/xml/juce_XmlDocument.h"; sourceTree = "SOURCE_ROOT"; }; @@ -829,6 +835,7 @@ B67F3F40C568E6A0A85B13D9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcphuff.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jcphuff.c"; sourceTree = "SOURCE_ROOT"; }; B6C40E843F7E8E7C4768B99E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_GZIPDecompressorInputStream.cpp"; path = "../../../../modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp"; sourceTree = "SOURCE_ROOT"; }; B6D03F8491E288FD4BC31445 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ColourSelector.h"; path = "../../../../modules/juce_gui_extra/misc/juce_ColourSelector.h"; sourceTree = "SOURCE_ROOT"; }; + B7307A82D9EB1EDBA91EE43D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_DownloadCompileEngineThread.h"; path = "../../Source/Application/jucer_DownloadCompileEngineThread.h"; sourceTree = "SOURCE_ROOT"; }; B741170E45D74F30B7D5CDDF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentNameProperty.h"; path = "../../Source/ComponentEditor/components/jucer_ComponentNameProperty.h"; sourceTree = "SOURCE_ROOT"; }; B743DC50150100FFA2DE76AD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Strings.mm"; path = "../../../../modules/juce_core/native/juce_mac_Strings.mm"; sourceTree = "SOURCE_ROOT"; }; B79595279502C1A11A4E8C36 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Point.h"; path = "../../../../modules/juce_graphics/geometry/juce_Point.h"; sourceTree = "SOURCE_ROOT"; }; @@ -1142,6 +1149,8 @@ 6E6140969908E7619F858740, C7608A3967D9AB9481848F2B, E65A820D34BF39478B7C5925, + 11EB44786085029106099D01, + B7307A82D9EB1EDBA91EE43D, 6AEF2E6130619AE550A5FCA7, D526C38D581425949BA0E4AC, 84DE44680C9D37CDDCD127FF, @@ -1352,6 +1361,11 @@ 471C7B0A8B92320AF0C80839, 714267352CE5C4357ADBC231, C09BBB58CA45B66D693E8C31, ); name = Wizards; sourceTree = ""; }; + 645F98392B3C8E92EE64B533 = {isa = PBXGroup; children = ( + 129F2DE0FEF154F8F8C7A74E, + 0B24F292A357ABFD9BCC6D7F, + 576A92E1E0D8F453EC0FEB34, + 996E472B82A75531875A5E38, ); name = gradle; sourceTree = ""; }; C76CE0579AC77DF56E755836 = {isa = PBXGroup; children = ( 468BFFBE4DA7835DD40C5FE8, E3B56C5718D87CA0EFCB2662, @@ -1375,6 +1389,7 @@ F7CAB5BC15EE351949D3F2C3, 73B9F17FE55A02C2BB87E008, ); name = templates; sourceTree = ""; }; 63EE1C3AC218E509130AF2BA = {isa = PBXGroup; children = ( + 645F98392B3C8E92EE64B533, C76CE0579AC77DF56E755836, BB9C1E6E54A16F795908C469, 301592EBAC0FFF6F5B268E99, @@ -2378,8 +2393,8 @@ "_DEBUG=1", "DEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=4.2.4", - "JUCE_APP_VERSION_HEX=0x40204", ); + "JUCE_APP_VERSION=4.3.0", + "JUCE_APP_VERSION_HEX=0x40300", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-App.plist; @@ -2402,8 +2417,8 @@ "_NDEBUG=1", "NDEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=4.2.4", - "JUCE_APP_VERSION_HEX=0x40204", ); + "JUCE_APP_VERSION=4.3.0", + "JUCE_APP_VERSION_HEX=0x40300", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); @@ -2461,6 +2476,7 @@ 6DD9DA1677A6CF789CDAB478, 954A036F5DDB375DB23FFB3E, 3EB3D569250C4BA4CA9AF578, + 636D21BF846031A6A1A7476A, 3C3B0ED6C43FDA3AF76DEE2E, 95B44E6C74B1DED31DBE37EB, AA9D0B8E23F3D87A23DE9F8A, diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj b/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj index e94fdf1d..413b499c 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj @@ -58,7 +58,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.2.4;JUCE_APP_VERSION_HEX=0x40204;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.3.0;JUCE_APP_VERSION_HEX=0x40300;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -97,7 +97,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.2.4;JUCE_APP_VERSION_HEX=0x40204;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.3.0;JUCE_APP_VERSION_HEX=0x40300;%(PreprocessorDefinitions) MultiThreaded true @@ -135,6 +135,7 @@ + @@ -1326,6 +1327,7 @@ + @@ -1873,6 +1875,10 @@ + + + + diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj.filters index f13c3053..d6fd3b96 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj.filters @@ -47,6 +47,9 @@ {FE290DF2-C600-4159-D484-7F48DB498EBE} + + {661FA330-2192-FAA3-E7B2-FAF8EBB783C6} + {DD0D745A-044A-A337-0DBA-0816C2E7C767} @@ -277,6 +280,9 @@ Projucer\Application + + Projucer\Application + Projucer\Application @@ -1665,6 +1671,9 @@ Projucer\Application + + Projucer\Application + Projucer\Application @@ -3302,6 +3311,18 @@ + + Projucer\BinaryData\gradle + + + Projucer\BinaryData\gradle + + + Projucer\BinaryData\gradle + + + Projucer\BinaryData\gradle + Projucer\BinaryData diff --git a/extras/Projucer/Builds/VisualStudio2013/resources.rc b/extras/Projucer/Builds/VisualStudio2013/resources.rc index fe0989e3..61a9e7d6 100644 --- a/extras/Projucer/Builds/VisualStudio2013/resources.rc +++ b/extras/Projucer/Builds/VisualStudio2013/resources.rc @@ -7,16 +7,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 4,2,4,0 +FILEVERSION 4,3,0,0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "Projucer\0" - VALUE "FileVersion", "4.2.4\0" + VALUE "FileVersion", "4.3.0\0" VALUE "ProductName", "Projucer\0" - VALUE "ProductVersion", "4.2.4\0" + VALUE "ProductVersion", "4.3.0\0" END END diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj b/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj index e4468cf7..75334440 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj @@ -58,7 +58,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.2.4;JUCE_APP_VERSION_HEX=0x40204;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.3.0;JUCE_APP_VERSION_HEX=0x40300;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -97,7 +97,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.2.4;JUCE_APP_VERSION_HEX=0x40204;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.3.0;JUCE_APP_VERSION_HEX=0x40300;%(PreprocessorDefinitions) MultiThreaded true @@ -135,6 +135,7 @@ + @@ -1326,6 +1327,7 @@ + @@ -1873,6 +1875,10 @@ + + + + diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj.filters index 431d56d5..cac93bc3 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj.filters @@ -47,6 +47,9 @@ {FE290DF2-C600-4159-D484-7F48DB498EBE} + + {661FA330-2192-FAA3-E7B2-FAF8EBB783C6} + {DD0D745A-044A-A337-0DBA-0816C2E7C767} @@ -277,6 +280,9 @@ Projucer\Application + + Projucer\Application + Projucer\Application @@ -1665,6 +1671,9 @@ Projucer\Application + + Projucer\Application + Projucer\Application @@ -3302,6 +3311,18 @@ + + Projucer\BinaryData\gradle + + + Projucer\BinaryData\gradle + + + Projucer\BinaryData\gradle + + + Projucer\BinaryData\gradle + Projucer\BinaryData diff --git a/extras/Projucer/Builds/VisualStudio2015/resources.rc b/extras/Projucer/Builds/VisualStudio2015/resources.rc index fe0989e3..61a9e7d6 100644 --- a/extras/Projucer/Builds/VisualStudio2015/resources.rc +++ b/extras/Projucer/Builds/VisualStudio2015/resources.rc @@ -7,16 +7,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 4,2,4,0 +FILEVERSION 4,3,0,0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "Projucer\0" - VALUE "FileVersion", "4.2.4\0" + VALUE "FileVersion", "4.3.0\0" VALUE "ProductName", "Projucer\0" - VALUE "ProductVersion", "4.2.4\0" + VALUE "ProductVersion", "4.3.0\0" END END diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.cpp b/extras/Projucer/JuceLibraryCode/BinaryData.cpp index e126862a..7b1f615f 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.cpp +++ b/extras/Projucer/JuceLibraryCode/BinaryData.cpp @@ -7,8 +7,1230 @@ namespace BinaryData { -//================== jucer_AnimatedComponentTemplate.cpp ================== +//================== gradle-wrapper.jar ================== static const unsigned char temp_binary_data_0[] = +{ 80,75,3,4,10,0,0,8,8,0,42,178,149,71,0,0,0,0,2,0,0,0,0,0,0,0,9,0,0,0,77,69,84,65,45,73,78,70,47,3,0,80,75,3,4,10,0,0,8,8,0,42,178,149,71,215,149,152,82,63,0,0,0,85,0,0,0,20,0,0,0,77,69,84,65,45,73,78,70,47,77,65,78,73,70,69,83,84,46,77,70,243,77,204, +203,76,75,45,46,209,13,75,45,42,206,204,207,179,82,48,212,51,224,229,242,204,45,200,73,205,77,205,43,73,44,1,10,234,134,100,150,228,164,90,41,184,23,37,166,228,164,98,200,194,181,26,233,25,2,245,242,114,1,0,80,75,3,4,10,0,0,8,8,0,22,178,149,71,0,0,0, +0,2,0,0,0,0,0,0,0,4,0,0,0,111,114,103,47,3,0,80,75,3,4,10,0,0,8,8,0,22,178,149,71,0,0,0,0,2,0,0,0,0,0,0,0,11,0,0,0,111,114,103,47,103,114,97,100,108,101,47,3,0,80,75,3,4,10,0,0,8,8,0,22,178,149,71,0,0,0,0,2,0,0,0,0,0,0,0,19,0,0,0,111,114,103,47,103,114, +97,100,108,101,47,119,114,97,112,112,101,114,47,3,0,80,75,3,4,10,0,0,8,8,0,22,178,149,71,104,130,100,102,163,0,0,0,213,0,0,0,35,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,68,111,119,110,108,111,97,100,36,49,46,99,108, +97,115,115,125,140,77,10,194,48,16,133,223,104,53,90,43,118,47,130,11,215,134,158,193,31,112,33,46,60,65,108,67,108,9,73,73,170,189,155,11,15,224,161,196,20,113,235,60,230,61,30,204,124,175,247,227,9,32,67,194,192,24,98,66,124,182,55,151,203,125,169, +37,97,186,181,173,209,86,20,235,74,220,5,97,182,51,185,182,190,52,234,40,155,171,45,24,38,132,133,117,138,43,39,10,45,121,235,68,93,75,199,127,127,171,140,0,66,114,48,70,186,141,22,222,75,79,72,59,26,215,194,40,126,186,84,50,111,8,243,63,144,116,25,16, +61,124,167,31,132,208,34,12,66,70,24,6,31,135,141,195,13,117,45,29,125,0,80,75,3,4,10,0,0,8,8,0,22,178,149,71,197,222,133,214,20,2,0,0,112,4,0,0,68,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,68,111,119,110,108,111,97, +100,36,83,121,115,116,101,109,80,114,111,112,101,114,116,105,101,115,80,114,111,120,121,65,117,116,104,101,110,116,105,99,97,116,111,114,46,99,108,97,115,115,165,83,109,111,18,65,16,126,22,40,135,199,209,226,169,96,173,149,218,214,122,84,229,138,111, +209,96,26,9,141,137,9,49,77,170,77,76,63,109,97,3,103,174,119,100,111,145,242,175,244,139,109,52,241,7,248,163,140,179,64,149,32,1,19,239,195,206,236,60,243,204,60,59,187,247,227,231,215,239,0,202,120,106,34,141,130,9,11,5,3,107,41,220,54,177,142,141, +20,54,83,88,214,238,29,19,91,184,107,34,14,199,192,182,129,123,12,201,23,94,224,169,93,134,184,83,60,100,72,212,194,166,96,88,170,123,129,120,211,61,57,22,242,45,63,246,41,98,215,195,6,247,15,185,244,244,126,20,76,168,182,23,49,172,31,244,35,37,78,246, +101,216,17,82,121,34,34,239,180,95,237,170,182,8,148,215,224,42,148,12,214,235,32,16,178,230,243,40,18,196,121,89,15,101,203,109,73,222,244,133,219,147,188,67,84,119,47,236,5,126,200,155,155,243,11,86,24,150,91,66,237,83,185,94,40,155,99,152,23,6,12, +27,78,177,254,129,127,228,110,32,148,59,61,169,98,224,62,3,72,190,51,83,75,185,162,7,19,59,221,97,40,204,73,100,48,15,194,174,108,136,87,158,30,79,230,2,42,105,41,22,50,88,164,26,115,100,49,44,182,149,234,148,58,250,200,239,34,33,13,60,176,80,130,75, +119,240,7,184,224,106,100,199,64,217,194,67,60,210,29,30,27,120,194,176,251,127,195,101,200,253,86,57,1,172,206,156,0,67,118,64,244,121,208,114,135,125,24,210,250,158,134,221,250,12,91,78,125,44,69,73,47,104,85,138,127,135,24,158,77,73,252,71,106,118, +50,70,34,84,88,107,115,89,149,146,147,136,132,83,60,170,49,228,167,180,56,170,233,235,94,153,113,76,172,209,95,102,65,127,113,196,244,173,210,35,90,162,157,75,150,94,20,22,182,207,16,251,76,78,12,89,90,147,131,32,199,101,90,173,97,2,108,92,35,155,64, +14,249,17,185,74,81,141,229,191,33,254,222,78,156,99,193,78,218,198,57,82,95,112,233,12,230,167,137,114,98,172,92,126,88,142,192,12,110,140,202,61,39,27,27,105,97,211,181,228,134,9,35,45,218,91,193,205,1,109,117,144,127,11,87,201,218,228,165,81,196,21, +152,184,78,22,217,212,47,80,75,3,4,10,0,0,8,8,0,22,178,149,71,231,236,88,115,170,0,0,0,219,0,0,0,34,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,73,68,111,119,110,108,111,97,100,46,99,108,97,115,115,69,141,193,10,194,48, +12,134,255,204,233,230,20,17,188,10,94,245,98,241,188,171,10,3,65,80,244,94,183,50,54,74,59,234,116,62,155,7,31,192,135,18,59,149,25,8,201,151,252,249,243,124,221,31,0,22,232,123,232,122,8,8,126,162,43,37,53,79,8,147,233,38,231,87,206,148,40,217,97,23, +133,95,202,52,91,103,82,132,179,35,33,88,221,98,81,148,153,86,103,15,61,203,123,125,49,177,168,247,132,65,180,252,89,205,235,67,194,88,155,148,165,134,39,82,176,202,240,162,16,134,53,26,194,240,99,47,185,74,217,246,148,139,184,36,140,254,163,230,83,135, +64,112,80,7,185,132,22,92,203,109,75,117,237,216,244,108,239,192,127,3,80,75,3,4,10,0,0,8,8,0,22,178,149,71,4,169,122,221,92,2,0,0,81,4,0,0,45,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,71,114,97,100,108,101,85,115,101, +114,72,111,109,101,76,111,111,107,117,112,46,99,108,97,115,115,141,83,91,79,26,65,20,254,70,145,93,214,245,82,172,40,181,182,106,91,4,91,217,90,237,85,211,196,203,170,137,84,8,32,9,79,100,133,9,174,46,187,100,89,108,252,87,189,36,106,106,210,199,62,244, +71,53,61,195,82,43,200,131,187,201,185,205,119,190,115,230,204,204,239,63,63,126,2,88,194,170,130,81,204,201,120,162,224,41,158,73,136,41,8,96,94,70,92,248,137,16,70,176,32,225,185,130,144,0,189,16,122,81,70,82,104,77,194,75,9,75,12,147,91,250,246,250, +65,42,95,218,201,174,111,165,244,210,65,78,207,150,118,211,159,116,134,112,234,216,56,53,52,203,176,171,90,206,115,77,187,186,202,48,221,141,43,101,178,233,140,158,205,23,75,123,122,145,97,104,211,177,27,158,97,123,5,195,106,114,226,191,133,215,247,11, +62,52,184,102,218,166,247,145,161,63,158,40,48,4,54,157,10,37,140,164,76,155,239,55,107,135,220,205,27,135,22,23,125,56,101,195,42,24,174,41,252,118,48,224,29,153,13,134,68,202,113,171,90,213,53,42,22,215,62,187,70,189,206,93,109,167,229,30,52,184,187, +235,212,120,202,113,78,154,117,106,125,184,218,17,103,24,141,39,252,45,154,142,182,109,90,156,48,242,90,217,106,119,165,228,156,166,91,230,98,129,33,218,139,51,41,146,85,68,48,65,92,62,121,178,73,136,228,17,65,36,188,82,177,140,21,6,245,102,13,1,127, +77,240,238,177,168,120,131,21,21,247,16,102,152,232,158,251,70,211,180,42,220,101,8,93,211,171,120,139,119,212,175,150,244,11,171,120,143,15,12,243,119,28,7,117,240,191,72,250,240,152,151,189,142,80,238,172,225,241,26,195,96,149,123,25,215,33,26,239, +140,33,22,191,125,37,18,189,110,201,120,47,32,157,113,144,232,184,125,74,134,104,205,174,48,44,222,137,178,61,0,113,64,158,227,135,24,238,199,123,212,198,44,221,250,81,122,29,253,136,138,105,146,21,197,24,105,194,147,221,71,127,20,227,55,252,32,33,153, +56,67,146,147,20,209,72,51,210,3,11,23,96,95,91,144,40,201,96,43,56,142,7,36,85,31,128,41,60,36,29,194,52,30,181,147,79,90,100,244,52,195,125,151,232,47,238,253,130,122,133,64,145,168,6,190,132,131,151,144,58,67,194,248,6,89,152,215,133,34,68,12,34,86, +136,118,12,143,73,206,32,134,185,235,194,18,22,40,38,246,37,211,234,191,174,151,41,91,124,83,87,8,21,47,160,132,7,169,254,57,212,240,16,137,115,12,127,135,44,246,194,110,236,37,66,114,166,85,118,246,47,80,75,3,4,10,0,0,8,8,0,22,178,149,71,28,226,93,219, +197,5,0,0,250,10,0,0,51,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,69,120,99,108,117,115,105,118,101,70,105,108,101,65,99,99,101,115,115,77,97,110,97,103,101,114,46,99,108,97,115,115,149,86,75,112,19,101,28,255,109,154, +38,105,186,109,33,64,33,80,108,0,133,180,80,130,40,22,211,130,150,216,98,104,90,160,13,165,5,21,183,201,54,93,186,221,141,155,77,75,125,32,62,234,251,117,240,232,157,163,50,35,45,88,7,198,25,71,71,199,131,58,227,129,241,194,197,25,47,158,24,47,30,196, +223,183,155,150,190,29,14,249,30,255,231,239,255,250,54,63,254,251,213,13,0,15,227,147,32,182,161,179,2,17,164,196,210,229,71,119,16,94,28,247,227,68,16,62,116,138,203,73,113,234,9,160,87,236,105,65,57,37,150,190,32,78,163,223,143,129,0,206,4,81,35,136, +53,56,27,196,51,120,54,72,83,207,5,113,14,207,251,161,4,48,40,20,51,1,100,133,154,26,68,45,134,42,145,195,112,16,26,206,87,98,4,186,31,163,126,24,126,152,18,214,164,142,39,58,207,117,36,83,237,231,122,79,117,116,36,251,37,132,82,231,149,49,37,166,43, +70,46,214,107,91,154,145,107,145,80,149,48,141,130,173,24,118,159,162,23,85,9,21,182,54,170,154,69,187,171,32,65,74,74,168,206,155,186,158,52,108,213,26,83,116,65,244,181,106,134,102,31,150,80,30,77,38,27,250,36,120,19,102,150,138,53,41,205,80,187,139, +163,131,170,149,86,6,117,85,248,51,51,138,222,167,88,154,184,151,136,94,123,88,163,149,88,202,180,114,177,156,165,100,117,53,54,110,41,249,188,106,197,218,47,100,244,98,65,27,83,59,52,93,109,203,100,212,66,161,75,49,148,156,106,17,168,79,113,8,18,218, +162,110,28,154,25,19,114,45,238,173,104,107,122,44,99,26,153,162,101,169,134,29,75,40,186,46,60,182,52,204,139,250,248,224,121,53,99,211,152,159,33,91,118,155,205,24,143,17,147,110,102,70,36,212,185,146,6,13,103,134,21,195,80,245,130,227,129,97,140,136, +76,169,243,225,49,51,11,97,136,208,148,2,205,212,255,15,32,9,1,225,207,53,178,198,82,140,172,57,234,6,235,146,54,207,217,237,89,196,19,192,75,200,230,220,44,65,155,112,47,148,173,93,152,255,137,252,108,13,30,92,29,97,107,58,221,114,152,250,65,214,67, +205,219,26,27,132,125,209,171,229,12,197,46,90,212,239,106,77,199,151,102,245,240,125,213,197,117,210,192,85,194,218,81,101,98,80,77,232,102,65,61,89,212,84,91,159,32,248,123,214,28,134,91,75,182,155,143,56,76,129,98,195,60,8,115,72,105,173,34,51,43, +47,97,221,50,70,24,88,175,89,180,50,165,50,214,175,220,117,123,133,178,140,40,242,50,30,194,78,25,187,176,83,130,60,63,74,25,47,192,146,176,113,241,100,29,41,106,122,86,181,100,20,96,203,40,98,140,237,177,87,207,140,200,24,23,132,40,46,200,152,192,139, +126,188,36,227,101,188,34,97,211,74,69,151,224,177,198,101,92,196,171,126,92,146,241,26,94,151,145,192,83,126,188,33,227,77,76,178,95,238,249,238,41,26,98,124,231,178,33,161,50,237,142,115,196,28,138,8,28,111,113,244,34,150,170,100,134,213,108,100,92, +209,108,98,141,12,153,86,100,174,185,35,238,156,69,108,51,50,68,247,113,170,189,237,66,126,199,143,119,101,188,135,247,253,248,64,198,135,200,251,241,145,140,143,145,103,158,151,41,133,132,166,251,154,113,14,195,226,158,146,80,22,21,53,175,202,169,246, +9,69,244,79,105,106,162,13,139,135,207,79,145,110,101,148,204,245,209,134,229,30,58,159,240,111,100,137,42,186,148,189,84,163,84,64,49,173,182,233,146,36,236,88,182,197,23,24,18,29,58,58,146,213,172,130,3,254,204,130,168,122,39,10,182,58,202,134,47,77, +131,40,78,151,166,235,154,43,204,167,40,200,48,18,179,35,190,109,54,146,85,134,124,235,170,2,204,139,109,77,164,156,231,237,129,21,173,149,30,184,121,64,211,195,236,17,230,170,188,160,171,42,235,235,141,30,19,145,213,69,147,171,101,170,134,224,219,6, +11,166,94,180,213,19,138,61,204,25,93,46,215,125,179,168,87,122,27,232,143,15,151,190,184,148,115,175,247,230,149,195,96,192,150,170,171,74,129,70,214,46,153,125,6,228,60,14,252,88,71,248,3,202,16,198,118,236,0,223,68,222,60,8,34,36,38,157,231,144,24, +118,71,66,98,235,55,112,109,228,109,128,50,101,220,107,26,167,33,53,110,185,10,79,99,221,85,148,93,113,148,119,59,106,94,174,219,184,110,71,5,13,87,211,240,30,82,34,174,26,154,176,23,112,78,194,141,228,156,132,35,15,207,49,236,163,20,221,120,234,248, +161,151,1,201,51,3,239,192,238,41,148,207,192,55,48,13,63,143,129,41,84,132,130,92,166,80,57,13,185,187,137,220,41,84,157,150,226,94,41,94,126,13,213,205,62,41,30,8,7,190,71,7,47,181,190,198,47,225,153,84,62,253,12,205,51,168,25,104,10,173,153,198,218, +184,55,236,157,66,40,94,30,166,234,58,71,250,238,207,97,42,175,15,123,185,80,165,108,242,26,54,92,190,59,35,236,52,205,160,118,160,4,32,180,145,158,133,201,41,108,10,133,121,38,162,205,179,96,182,220,220,115,29,117,18,226,21,97,162,220,234,24,36,38,199, +38,225,221,115,16,174,248,34,30,92,94,38,120,51,94,57,79,176,242,38,51,249,57,166,113,139,153,186,133,223,157,125,31,126,194,29,231,254,183,179,151,57,153,191,136,122,174,187,152,247,40,115,216,192,76,55,82,178,9,7,152,241,131,60,165,248,55,173,31,251, +249,111,234,17,12,145,58,130,199,144,71,51,223,196,131,184,132,86,76,226,16,61,181,209,87,2,95,163,29,223,160,3,223,226,40,126,192,211,244,215,137,95,104,225,22,121,183,201,251,131,188,63,201,251,139,188,59,228,253,67,158,168,114,15,2,180,124,131,158, +246,179,130,7,49,67,95,143,146,198,74,206,86,158,167,3,244,44,57,167,102,202,120,136,248,54,30,39,173,140,50,191,33,142,22,198,188,15,191,18,211,33,148,227,48,149,228,57,249,39,40,255,36,41,94,82,234,137,86,244,221,17,182,45,191,8,165,22,61,203,221,227, +180,232,119,168,106,188,142,7,36,92,134,55,117,133,100,47,5,171,168,230,182,106,45,141,3,39,73,237,37,189,143,156,52,219,181,223,9,164,150,50,213,220,219,25,168,219,164,71,25,42,49,32,233,184,60,246,31,80,75,3,4,10,0,0,8,8,0,22,178,149,71,204,13,94,70, +145,2,0,0,249,6,0,0,45,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,87,114,97,112,112,101,114,67,111,110,102,105,103,117,114,97,116,105,111,110,46,99,108,97,115,115,141,147,109,79,19,65,16,199,255,219,231,214,131,62,130, +128,162,162,34,237,33,156,160,224,51,9,15,85,49,85,12,21,72,124,67,174,112,150,35,229,142,220,93,53,241,83,105,34,49,241,133,31,192,15,101,156,189,91,160,172,219,196,55,51,179,51,243,159,253,237,92,251,251,207,207,95,0,230,240,40,135,75,152,201,96,54, +139,28,140,12,238,113,63,199,205,60,55,247,185,121,192,205,66,26,139,105,60,100,208,246,109,63,240,236,86,55,176,93,135,97,176,113,104,126,50,13,199,10,140,173,205,245,167,12,133,222,250,138,233,91,12,165,168,167,99,58,109,163,73,53,167,45,247,189,51, +131,3,134,161,222,84,243,192,156,95,88,108,118,143,24,210,95,236,227,104,18,143,162,222,212,51,219,177,131,37,134,120,181,182,205,144,88,117,247,169,158,111,216,142,245,182,123,212,178,188,247,102,171,19,222,237,238,153,157,109,211,179,249,89,36,19,193, +129,237,51,212,26,174,215,54,218,158,185,223,177,140,207,158,121,124,108,121,198,78,228,87,93,231,163,221,238,122,38,103,33,220,124,219,10,214,46,188,188,80,173,201,111,207,251,114,83,177,122,177,135,179,150,165,81,209,211,42,167,227,46,174,169,236,171, +154,135,170,255,246,170,70,71,187,146,103,68,217,17,169,183,103,225,35,126,223,82,142,84,31,78,63,71,206,239,61,68,149,104,184,168,136,67,211,237,122,123,214,11,155,239,126,84,181,224,89,254,26,13,21,12,209,94,95,110,46,175,53,234,187,91,205,250,230, +238,171,141,55,117,13,131,200,51,12,156,126,33,254,43,241,53,20,144,215,80,226,166,204,141,134,1,13,69,222,56,245,159,95,149,174,58,95,226,70,235,208,218,11,48,1,254,135,0,82,136,241,137,20,197,248,237,161,47,8,95,20,190,36,124,57,244,3,96,156,159,236, +48,157,118,40,207,200,143,235,63,192,244,82,236,4,113,189,148,56,65,50,140,83,97,156,254,22,202,47,147,29,70,146,108,5,9,138,114,148,41,96,148,162,49,140,80,86,139,6,81,102,140,60,195,21,92,21,151,24,228,121,45,169,127,71,230,235,217,176,148,16,156,139, +147,103,226,113,92,19,226,37,234,142,241,110,125,250,4,153,115,148,92,152,157,32,205,205,112,194,112,212,37,38,240,72,11,223,202,112,29,55,20,32,113,25,100,82,9,50,65,227,21,32,113,25,164,70,26,189,15,8,255,48,252,226,91,74,144,164,12,50,163,4,185,173, +6,73,202,32,115,164,153,239,3,82,16,32,147,74,144,172,12,178,160,4,185,163,6,201,202,32,143,73,243,164,15,72,81,128,76,41,65,82,50,200,115,37,72,85,13,146,146,65,150,73,179,210,7,164,36,64,106,74,144,180,12,82,87,130,232,106,144,180,12,178,78,154,215, +125,64,202,2,100,58,212,220,253,11,80,75,3,4,10,0,0,8,8,0,22,178,149,71,81,125,29,105,229,4,0,0,25,10,0,0,48,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,83,121,115,116,101,109,80,114,111,112,101,114,116,105,101,115,72, +97,110,100,108,101,114,46,99,108,97,115,115,141,86,235,115,19,85,20,255,109,155,100,195,118,203,163,80,74,74,133,8,2,105,250,136,128,21,108,10,42,208,74,165,15,36,80,44,130,186,77,111,147,133,100,55,108,54,180,21,21,159,248,70,253,194,12,142,195,87,62, +57,131,195,24,192,206,200,119,255,40,245,119,55,161,205,139,218,102,122,238,189,231,117,207,249,157,115,207,236,223,255,252,249,23,128,253,248,89,195,46,140,168,120,67,67,19,70,52,156,196,168,138,55,53,248,37,243,148,6,21,99,242,48,46,119,19,42,38,85, +156,86,241,150,134,86,140,4,113,70,174,9,73,206,74,114,78,131,142,169,32,206,107,120,27,211,210,236,66,11,222,193,197,22,92,194,187,146,188,39,47,59,39,165,239,107,48,48,35,73,82,195,44,132,84,158,107,65,10,105,21,166,138,203,10,2,67,166,101,186,71,21, +52,71,186,167,20,248,142,219,179,66,193,134,49,211,18,19,133,236,140,112,206,26,51,25,114,218,198,236,164,145,153,50,28,83,158,203,76,159,155,54,243,10,122,199,108,39,21,75,57,198,108,70,196,230,29,35,151,19,78,44,177,152,119,69,246,180,99,243,224,154, +34,127,210,176,40,118,226,10,54,167,132,91,43,85,176,51,50,118,217,184,102,196,76,59,54,98,102,68,188,187,116,44,184,102,38,54,110,228,104,23,52,173,132,235,8,35,171,32,84,165,59,106,229,10,110,73,68,53,133,129,181,47,203,71,39,135,23,146,34,231,154, +182,69,89,243,21,177,40,115,241,164,25,195,74,197,104,102,90,41,138,212,172,225,38,211,194,89,118,238,221,236,136,148,88,224,253,158,72,198,96,56,169,66,86,88,110,181,151,201,153,203,34,233,82,222,100,190,160,96,75,133,131,81,87,56,134,107,75,219,245, +185,229,116,101,212,100,84,103,172,160,165,172,177,200,132,101,17,106,17,208,114,21,128,109,173,16,175,0,41,51,201,25,46,111,181,26,101,114,186,36,138,75,243,170,130,46,230,158,22,117,160,250,218,161,122,176,234,57,71,233,112,93,194,76,89,134,91,112, +232,99,120,245,98,174,217,167,150,176,11,78,82,148,224,234,122,70,75,245,75,83,29,187,65,232,55,173,220,115,210,200,167,121,151,138,43,58,50,96,211,108,105,132,151,130,142,103,180,146,244,104,233,176,145,211,113,85,250,222,220,160,167,20,116,174,4,126, +166,96,185,102,86,84,8,59,106,179,58,86,48,51,179,178,201,118,15,59,142,237,132,231,211,194,10,103,108,99,150,178,240,74,117,195,115,140,229,136,14,7,121,73,92,29,5,92,147,1,205,43,216,152,95,134,225,98,127,164,63,218,173,98,65,199,34,62,208,113,29,31, +170,248,72,199,199,184,161,226,19,29,159,130,89,124,134,207,117,28,192,23,42,190,212,113,83,114,190,194,215,42,190,209,241,45,190,211,241,61,126,80,113,75,199,143,248,73,65,116,237,15,153,129,212,246,191,2,189,18,75,14,23,179,220,233,28,46,23,88,156, +218,174,144,3,71,38,175,96,219,138,168,242,53,75,13,127,50,99,231,165,51,25,142,69,221,190,72,125,179,116,215,177,202,72,199,107,244,203,47,117,53,253,160,107,151,88,108,153,72,189,34,53,162,13,34,168,224,156,77,59,246,188,124,76,94,252,29,207,120,131, +124,168,73,59,155,243,240,89,37,165,134,143,55,192,57,150,16,174,132,180,82,141,44,10,91,171,24,114,110,150,103,16,31,125,149,122,197,108,106,171,231,50,190,180,145,159,16,11,116,225,179,188,165,26,142,229,161,119,176,50,250,227,105,195,73,136,171,5, +97,37,69,131,28,86,70,105,29,46,227,79,7,176,111,206,148,117,246,167,28,187,192,57,216,30,25,109,88,133,141,181,60,226,146,17,86,202,77,123,13,55,74,154,146,249,239,253,159,250,47,231,81,1,156,55,128,155,217,136,10,14,55,48,95,147,67,60,207,223,46,200, +191,38,40,114,62,145,238,225,41,198,85,225,234,143,62,132,242,187,39,222,75,26,240,152,219,177,143,84,47,41,32,130,110,174,235,16,69,15,181,104,172,60,128,15,65,242,254,88,66,211,244,67,52,143,69,139,240,253,2,127,207,253,37,248,201,8,140,47,65,157,166, +231,224,68,111,95,17,235,248,175,221,131,62,232,147,155,144,239,201,61,132,39,150,160,79,47,161,149,218,235,219,54,20,177,145,46,54,21,209,214,247,16,155,159,180,109,121,132,246,137,222,34,182,62,70,135,130,65,95,200,247,24,219,20,220,193,9,185,11,145, +229,239,11,249,139,232,44,98,251,96,32,20,40,162,235,14,246,132,2,190,34,158,27,84,67,106,17,59,238,162,189,39,164,246,74,173,157,84,124,140,112,51,206,223,251,247,81,207,125,52,19,145,125,232,103,2,253,120,209,91,67,56,132,65,180,80,34,65,152,66,59, +233,14,166,184,19,27,16,198,38,234,135,136,220,46,74,247,17,142,30,2,210,207,245,16,122,105,21,69,156,156,243,228,92,34,170,215,233,241,38,63,182,110,113,220,221,198,65,220,197,75,184,79,205,7,56,236,129,58,7,249,97,212,78,203,62,222,22,71,23,237,98, +220,221,70,39,45,247,243,211,235,38,61,30,160,101,128,190,6,104,61,192,18,164,113,10,47,211,139,79,130,78,79,175,112,13,226,55,222,30,103,145,66,248,21,67,56,194,226,92,226,247,214,81,188,74,127,175,149,11,88,210,122,157,187,99,94,145,143,115,119,194, +219,13,255,7,80,75,3,4,10,0,0,8,8,0,22,178,149,71,165,121,48,186,86,2,0,0,0,5,0,0,31,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,76,111,103,103,101,114,46,99,108,97,115,115,133,147,251,111,210,80,20,199,191,151,199,42, +175,49,198,112,76,152,19,157,10,69,87,134,111,49,38,134,100,9,17,31,9,102,38,251,173,148,155,174,75,105,161,20,141,255,138,127,133,26,197,196,31,252,3,252,163,140,231,182,13,18,88,179,144,158,158,115,239,57,159,243,42,127,254,254,250,13,224,16,79,147, +72,224,102,2,151,112,43,129,219,168,38,81,131,44,68,93,136,59,66,220,149,112,32,65,145,208,96,136,143,167,6,119,25,216,9,195,218,51,195,50,220,231,12,177,234,73,237,152,94,109,123,192,25,178,93,195,226,175,167,195,62,119,222,169,125,147,78,54,187,182, +166,154,199,170,99,8,59,56,140,185,167,198,132,161,212,181,29,93,209,29,117,96,114,229,163,163,142,70,220,81,186,182,174,115,167,197,16,53,109,157,161,80,237,158,169,31,84,197,84,45,93,233,185,142,97,233,45,145,80,26,242,201,68,213,189,12,43,14,84,159, +128,89,3,134,198,98,124,251,84,117,122,124,60,229,150,198,91,181,133,139,23,158,183,40,78,36,214,38,99,134,98,88,28,67,51,148,217,233,132,82,227,19,87,117,196,244,58,148,193,43,109,167,218,14,245,102,26,61,109,134,100,207,158,58,26,63,50,196,216,82,254, +108,14,68,76,26,25,28,166,145,66,90,66,51,141,123,184,47,225,65,26,15,81,72,163,136,71,66,60,22,226,9,229,9,157,50,195,198,255,252,111,250,103,92,163,2,183,206,43,137,106,174,138,177,47,248,247,62,77,92,62,164,11,123,74,81,5,191,19,195,86,222,210,10, +92,90,4,87,135,212,72,254,156,99,218,222,72,88,166,197,160,92,180,159,21,226,225,197,211,95,137,41,206,71,189,116,133,10,125,253,9,208,160,233,217,20,227,164,127,70,156,244,12,214,73,102,201,58,66,132,126,64,82,254,9,38,151,126,32,242,149,172,8,54,72, +174,35,74,242,50,98,216,38,74,17,57,207,242,188,137,150,7,60,77,80,105,157,216,66,33,96,190,12,152,89,249,59,34,159,145,252,134,104,125,134,216,50,184,4,9,101,210,175,46,128,179,115,112,150,78,182,61,112,17,59,1,248,85,0,206,249,224,148,15,142,191,151, +191,44,161,43,132,190,78,33,251,11,232,220,28,157,195,21,74,238,163,203,1,90,163,46,99,244,206,251,232,140,64,151,119,103,88,91,133,87,9,94,35,72,221,131,203,126,216,28,158,15,224,66,219,165,222,34,158,182,71,90,212,75,120,45,188,151,210,12,210,106,58, +133,210,53,40,164,25,210,75,133,58,21,189,220,240,226,246,255,1,80,75,3,4,10,0,0,8,8,0,22,178,149,71,206,114,235,138,21,7,0,0,110,14,0,0,38,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,80,97,116,104,65,115,115,101,109, +98,108,101,114,46,99,108,97,115,115,149,86,249,99,27,87,17,254,214,214,21,121,147,56,138,115,216,181,131,98,39,141,44,217,22,73,83,40,73,19,240,213,68,173,175,250,42,78,218,184,107,107,35,111,42,239,186,187,171,196,134,114,19,40,247,125,4,2,148,251,6, +23,90,41,196,180,1,126,228,143,2,190,217,93,91,182,42,211,246,7,189,55,239,105,222,204,55,51,223,155,183,255,254,207,253,55,1,156,198,191,226,56,138,194,30,156,197,82,28,6,110,196,41,189,32,67,81,134,229,40,76,217,182,100,177,18,197,139,113,196,81,144, +29,91,36,39,6,87,230,82,28,81,220,148,237,91,50,172,70,177,22,199,65,124,36,142,143,202,127,103,241,82,12,31,139,226,227,113,124,2,159,140,225,83,113,124,26,159,145,197,103,69,186,29,197,231,100,254,124,28,199,240,178,12,95,136,226,139,81,124,41,134, +47,199,209,133,175,196,240,85,81,254,154,12,95,23,155,223,16,233,155,49,124,75,230,111,199,240,157,24,190,27,199,247,240,125,193,113,39,134,31,196,240,67,57,121,39,138,187,10,14,140,88,139,90,113,200,112,92,219,88,40,185,134,101,42,80,115,166,169,219, +131,69,205,113,116,71,193,145,75,147,253,67,35,195,243,51,83,195,147,243,151,199,71,135,231,167,166,39,115,99,151,20,36,70,110,104,55,181,108,81,51,11,217,41,26,48,11,231,21,236,29,180,76,199,213,76,119,86,43,150,116,5,251,38,38,199,159,28,30,156,222, +58,181,175,96,107,249,162,62,227,232,246,101,107,89,52,124,51,134,149,125,194,40,234,52,17,121,220,48,13,247,162,130,198,84,247,172,130,208,160,149,167,218,254,17,195,212,199,74,203,11,186,61,173,45,20,117,241,47,224,103,53,219,144,117,176,25,114,151, +12,162,238,28,177,236,66,214,119,149,189,101,107,43,43,186,157,157,208,220,165,126,70,181,76,77,155,142,14,164,118,186,22,111,251,11,186,187,51,31,243,169,122,182,158,241,103,70,123,221,40,148,108,77,116,207,119,191,173,215,19,111,73,184,228,108,113, +187,21,5,117,205,212,117,168,32,182,160,57,250,152,38,137,140,229,105,214,23,155,108,203,98,24,182,191,138,202,31,92,5,210,21,99,69,193,120,234,173,213,123,23,113,214,169,124,180,100,23,47,107,206,18,37,230,208,151,30,174,227,165,238,225,189,203,186, +227,104,5,125,200,40,232,142,171,160,195,87,114,244,197,146,109,184,107,217,209,237,127,83,63,188,176,230,10,59,27,174,14,40,80,24,227,161,109,86,135,87,23,245,149,32,63,17,199,115,193,194,218,250,178,117,83,31,94,117,117,211,241,210,28,50,189,236,40, +204,134,146,99,206,130,202,251,57,235,12,144,155,186,155,157,153,204,237,18,178,164,115,198,46,110,145,120,83,155,198,87,88,118,5,113,26,29,96,133,188,236,119,238,158,141,42,251,67,82,80,30,156,178,74,246,162,46,155,100,250,14,14,245,201,9,21,23,112, +81,197,121,60,30,197,143,84,12,227,199,42,158,195,53,21,115,120,90,197,83,24,227,69,222,110,89,197,79,240,138,138,5,44,242,74,215,162,24,40,25,197,188,110,171,248,169,232,252,12,63,103,70,178,42,126,33,171,11,248,165,138,95,137,244,107,188,162,224,204, +187,103,184,216,248,77,20,191,85,49,129,167,89,186,147,78,246,36,75,215,92,69,49,190,112,67,95,116,163,248,157,138,223,227,15,188,248,163,67,143,70,241,71,21,127,194,159,85,172,227,85,21,127,193,95,21,180,120,71,150,233,46,59,96,20,114,166,171,23,4,245, +107,162,112,1,175,11,226,178,130,131,117,152,160,160,173,186,59,89,50,93,99,89,223,246,103,251,160,85,42,230,147,166,229,38,151,72,220,164,97,174,148,220,164,79,157,62,177,93,97,70,40,220,195,223,84,220,199,134,138,191,75,70,238,139,187,230,218,6,169, +226,13,188,73,114,4,157,143,23,179,196,102,215,151,55,236,40,30,168,248,135,20,232,2,254,73,110,10,51,206,37,73,189,164,225,36,75,230,11,166,117,139,96,146,111,151,98,5,167,222,225,77,37,186,84,119,45,53,15,214,180,184,1,143,112,45,169,186,20,175,85, +158,240,104,29,17,87,102,94,65,239,59,186,224,1,191,164,93,185,214,84,112,33,187,106,186,111,29,67,179,254,5,98,195,242,49,6,11,31,67,127,221,190,188,179,199,215,243,176,189,219,171,219,83,179,131,146,155,40,35,215,45,155,132,83,240,129,58,145,94,29, +169,229,112,253,62,241,208,255,105,102,126,227,201,121,143,230,34,99,60,189,123,70,119,237,134,49,233,50,126,67,12,165,186,165,37,70,74,43,121,205,165,185,112,234,234,128,68,26,201,7,222,34,169,156,191,115,40,149,171,11,54,93,239,101,168,238,76,47,217, +214,45,121,107,189,4,54,241,51,129,224,243,250,234,248,117,49,89,7,59,243,186,199,41,45,108,246,225,195,169,92,125,191,242,106,4,236,210,95,44,105,69,167,198,222,102,130,175,236,172,211,154,227,234,203,126,18,39,108,139,20,112,215,118,1,50,139,227,252, +222,58,202,111,187,70,180,226,253,120,12,172,42,87,13,200,112,125,110,219,186,151,63,118,86,202,49,238,177,209,114,252,32,87,143,112,86,56,135,211,21,40,175,122,170,31,226,24,231,12,116,32,196,239,179,126,74,170,175,132,1,12,114,22,3,67,129,129,39,168, +41,186,113,49,144,206,188,142,134,170,149,125,132,5,36,105,229,56,246,160,211,179,116,216,215,14,44,137,36,176,4,196,48,109,249,54,255,75,79,81,206,183,211,153,50,26,43,8,141,166,123,42,8,143,165,123,51,21,68,206,133,54,16,157,147,191,98,21,236,217,64, +124,174,130,38,174,212,50,246,38,246,113,104,13,113,40,99,127,5,205,231,194,155,186,7,118,232,38,118,232,122,82,79,245,80,100,3,7,231,210,173,225,214,72,5,45,235,91,225,180,33,194,49,197,80,186,177,31,105,28,97,150,7,209,131,85,102,87,66,187,236,131, +222,10,237,54,46,113,143,92,193,75,200,177,22,13,60,117,19,79,82,106,228,89,147,79,218,99,76,205,32,245,71,152,130,48,237,236,197,40,165,8,53,249,220,5,201,184,193,127,66,156,143,165,137,176,177,140,67,21,28,30,75,28,9,191,129,163,115,141,153,169,185, +80,239,212,61,180,174,215,148,238,52,75,118,198,67,149,246,79,111,161,58,230,33,80,60,73,240,53,80,51,129,113,15,85,131,188,103,129,223,187,60,39,39,251,18,109,247,240,208,40,147,214,62,214,211,91,70,199,6,142,205,133,136,229,61,21,36,155,79,148,113, +124,125,116,3,93,115,137,19,172,209,201,7,158,229,227,44,118,231,142,172,245,115,28,64,19,49,52,147,58,157,44,118,23,203,45,248,206,50,190,8,218,49,137,41,158,104,98,102,166,49,67,44,93,148,103,241,140,23,77,223,22,250,62,124,216,67,223,32,95,5,1,210, +107,212,22,162,181,100,18,15,151,113,234,66,251,93,132,51,235,153,198,246,50,82,213,188,36,188,104,158,98,141,70,104,121,148,185,30,247,252,39,253,179,91,30,90,112,197,243,16,165,198,85,60,235,209,155,159,33,129,47,155,218,98,167,141,249,232,30,237,17, +230,156,186,216,65,135,61,235,61,29,161,231,203,72,87,61,30,102,100,96,84,97,70,164,50,166,102,198,147,32,254,106,85,218,182,188,182,97,30,207,211,71,24,135,160,121,92,81,121,125,196,191,84,133,223,56,129,255,151,121,78,50,50,148,73,16,65,207,29,196, +210,175,161,97,61,147,232,245,86,205,66,247,68,223,61,100,43,120,239,186,148,37,224,124,226,52,233,157,17,174,159,217,228,249,35,15,106,144,62,75,166,62,71,175,215,88,131,121,156,32,142,234,133,29,218,66,58,132,124,80,1,221,59,127,29,239,243,88,199,135, +149,181,124,20,202,255,0,80,75,3,4,10,0,0,8,8,0,22,178,149,71,56,222,182,221,27,19,0,0,236,41,0,0,32,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,73,110,115,116,97,108,108,46,99,108,97,115,115,157,89,11,124,20,229,181, +63,39,187,217,217,44,195,43,16,194,202,107,68,34,121,135,55,26,16,13,73,144,216,16,144,240,48,32,234,100,119,146,140,236,35,238,206,146,68,173,90,139,74,213,190,80,91,209,86,172,143,98,45,85,81,73,208,40,216,106,125,182,246,161,181,181,181,213,86,107, +111,235,237,189,189,247,246,222,219,251,42,247,127,102,118,55,155,100,16,226,47,191,253,102,230,123,156,231,255,156,239,124,95,94,253,251,211,71,137,104,33,127,16,160,62,206,151,198,39,141,34,141,95,154,130,2,52,1,105,198,201,167,26,160,50,30,175,240, +4,15,241,155,207,5,40,192,19,101,108,146,52,147,3,92,200,83,164,153,26,224,34,158,22,160,59,184,88,154,233,10,7,3,52,149,103,200,252,153,10,207,242,243,236,0,207,97,77,225,211,3,116,26,207,13,240,25,60,79,122,74,164,57,83,225,249,1,154,195,227,3,92,202, +101,1,170,227,114,249,172,144,166,82,154,170,113,92,205,53,10,47,240,243,66,133,23,201,140,197,1,154,207,75,164,127,169,159,151,201,115,185,136,123,150,140,157,29,160,98,174,245,243,10,121,174,44,224,115,120,85,128,207,229,243,2,120,171,83,120,117,128, +150,131,23,198,234,165,105,144,166,81,40,172,17,10,231,251,121,173,244,52,41,124,129,194,159,242,115,179,159,215,73,71,75,128,206,227,245,210,108,8,240,133,188,81,225,214,0,173,229,241,126,222,36,207,205,210,84,5,120,11,111,85,248,34,133,219,100,210, +182,0,173,231,237,1,106,225,139,21,222,17,160,86,225,219,194,151,248,249,82,249,184,76,154,42,133,245,0,181,113,187,194,161,0,109,231,118,63,135,253,108,248,185,67,228,237,44,224,46,54,69,171,203,253,188,83,158,17,17,38,170,112,44,64,29,176,36,154,248, +56,238,230,43,164,73,40,156,12,208,78,110,148,198,146,137,41,133,119,41,220,19,160,110,153,27,231,94,89,208,39,138,94,25,224,171,248,106,249,188,90,222,62,45,62,185,90,225,107,152,130,13,141,107,234,54,55,111,186,180,161,169,117,211,198,166,213,155,55, +53,173,111,185,116,67,221,166,181,76,133,205,151,235,187,244,154,136,30,235,172,105,181,18,102,172,115,5,211,248,250,120,44,105,233,49,107,139,30,73,65,242,107,153,124,145,120,103,167,145,96,154,209,28,79,116,214,116,38,244,112,196,168,233,73,232,221, +221,70,162,166,217,30,196,74,127,56,222,19,139,196,245,48,211,108,183,137,77,13,233,113,225,210,173,91,93,117,201,164,17,109,143,8,229,185,110,11,54,228,206,193,162,211,140,222,80,36,149,52,119,25,107,204,136,81,23,10,25,201,228,58,61,166,219,178,213, +184,81,104,60,225,2,144,243,173,52,99,166,181,138,233,146,210,143,209,235,227,53,57,185,216,101,91,152,188,245,241,176,193,52,177,217,140,25,45,169,104,187,145,216,164,99,80,60,16,15,233,145,45,122,194,148,239,116,167,215,234,50,147,76,51,93,57,139,111, +34,17,72,31,8,37,12,221,50,26,204,164,197,116,182,171,6,91,157,39,28,218,97,118,166,18,186,101,198,99,43,202,28,167,155,241,26,177,137,184,34,148,59,206,84,118,202,164,160,81,24,236,19,102,123,74,190,55,39,34,76,19,28,242,49,195,170,217,188,177,9,83, +138,114,167,180,118,233,139,150,46,107,77,69,153,38,71,68,245,134,156,65,133,175,67,119,243,200,110,38,181,41,22,3,239,136,14,163,194,48,75,78,106,244,121,163,136,64,16,69,4,105,48,19,89,25,135,76,160,218,178,108,51,187,229,27,166,5,108,140,110,89,150, +84,248,51,240,18,6,67,169,8,172,157,35,255,220,210,225,84,202,220,130,201,211,101,244,50,177,137,95,19,28,219,97,147,207,139,34,66,102,57,211,147,70,40,149,48,173,190,154,117,128,38,112,217,96,118,26,73,75,86,118,8,6,138,178,60,154,98,221,41,11,116,13, +61,138,81,134,85,124,237,169,142,14,65,126,222,246,213,8,190,246,62,128,65,183,116,166,2,48,117,36,96,154,62,74,170,213,246,42,208,152,217,105,88,117,177,240,22,35,97,118,244,229,218,106,99,60,14,72,45,24,161,223,104,245,70,33,169,56,215,213,13,70,50, +148,48,187,29,15,122,195,102,2,234,76,114,86,96,60,82,211,108,218,122,78,27,30,1,125,221,153,40,208,70,204,93,57,156,219,42,89,187,203,145,61,29,140,245,93,70,104,103,82,124,179,180,116,180,180,39,213,6,113,170,68,29,47,192,134,122,200,74,233,17,219, +211,5,201,120,42,17,50,108,120,143,51,122,187,141,144,101,132,237,17,127,196,129,20,84,211,220,225,144,171,170,87,79,36,230,33,102,182,143,180,155,55,98,196,48,144,103,162,41,104,53,59,99,186,149,74,24,163,93,48,146,166,139,73,166,39,13,171,177,23,160, +178,196,138,27,140,68,212,76,38,5,200,136,172,145,212,182,8,203,100,22,35,232,119,176,97,132,55,26,122,216,73,145,73,43,28,79,89,89,32,218,172,215,196,19,81,221,178,236,9,222,8,82,26,232,116,183,35,61,231,24,117,67,34,46,201,118,117,202,140,56,148,176, +161,209,148,209,19,100,196,24,134,243,245,217,224,91,145,5,129,189,162,41,6,150,137,84,55,140,159,59,37,224,36,130,181,241,40,232,140,119,62,234,227,209,168,30,67,148,169,88,17,79,172,203,122,213,76,110,53,99,216,166,160,181,167,180,108,27,20,140,39, +91,116,89,89,16,54,34,134,164,211,132,139,165,48,81,73,166,236,237,3,242,226,203,31,234,130,98,9,3,208,158,178,221,53,240,195,66,40,63,21,187,210,132,226,115,92,99,41,215,17,249,70,204,74,244,101,125,97,219,25,75,107,144,147,26,101,68,146,20,28,145,205, +1,18,56,25,34,235,115,250,133,181,205,210,27,54,100,99,80,132,174,41,89,179,56,135,114,99,44,21,53,178,73,92,185,50,147,248,138,71,115,79,67,116,98,40,222,221,151,147,131,152,170,75,93,115,147,187,84,14,214,96,45,143,141,38,79,68,44,23,208,109,139,206, +91,176,96,1,83,179,235,14,150,217,238,198,156,138,242,122,23,72,179,80,154,69,67,172,22,10,43,247,205,50,195,202,117,251,203,214,56,25,66,139,132,208,202,177,19,202,173,129,50,180,22,159,156,214,73,115,75,134,214,18,161,85,53,22,90,219,134,22,47,149, +197,23,158,194,226,177,230,213,188,222,197,67,92,150,9,151,21,99,118,119,110,180,100,72,45,31,179,182,178,184,213,78,231,14,226,213,244,188,106,153,166,210,243,244,130,74,191,161,119,85,58,76,253,42,253,156,126,161,210,32,61,163,210,117,244,25,149,174, +161,107,85,122,132,30,85,233,70,190,30,140,199,84,112,202,162,207,170,180,155,110,80,233,122,250,172,194,187,85,190,129,111,84,249,38,222,163,240,231,228,227,102,149,111,225,91,85,254,60,223,138,237,249,196,74,205,3,172,73,232,125,65,229,47,242,151,160, +69,174,146,8,232,214,181,117,85,168,83,20,254,178,202,123,249,54,4,118,238,132,156,112,5,17,122,65,225,219,85,190,131,191,162,242,87,249,78,149,247,241,93,200,46,238,101,131,194,119,171,252,53,254,186,202,247,240,126,149,239,229,111,72,115,159,202,247, +139,18,15,168,252,32,253,12,27,193,208,226,141,169,152,101,70,141,108,194,102,186,236,124,91,39,45,183,86,208,230,151,36,231,107,225,184,145,212,98,113,75,67,65,106,233,102,76,211,99,125,152,150,192,126,27,151,28,86,173,53,166,55,95,205,138,107,29,72, +228,154,209,139,125,58,210,167,45,204,206,235,171,70,153,49,196,127,125,251,229,232,86,249,155,124,64,12,246,144,202,223,226,253,76,59,78,40,68,154,119,18,44,226,90,244,147,73,160,242,195,252,109,149,238,33,152,232,32,127,71,229,71,96,21,238,178,43,45, +51,100,167,93,45,222,161,185,201,208,161,195,65,225,211,75,98,37,177,54,192,212,117,78,84,239,211,186,244,93,134,214,110,24,49,205,210,163,221,178,103,107,61,166,213,85,93,18,179,75,244,68,84,179,186,116,11,141,161,205,119,45,192,231,107,221,137,56,22, +90,125,26,44,221,39,188,28,176,85,165,193,86,157,30,135,218,154,212,173,154,153,132,113,18,162,35,28,19,150,37,154,158,128,104,233,132,6,140,216,236,210,203,181,142,68,60,170,233,154,149,72,37,197,94,78,13,85,45,138,105,185,197,166,134,178,170,86,43, +73,150,196,50,153,81,147,138,80,134,156,238,172,197,67,233,242,174,214,118,20,200,104,117,118,141,54,106,64,229,71,5,141,143,169,124,136,31,87,248,9,149,159,20,199,31,230,126,236,214,67,153,179,46,145,208,251,36,125,170,60,64,63,83,249,8,63,165,242,211, +242,54,8,159,209,155,130,228,64,187,25,75,7,161,192,231,25,108,208,39,170,113,134,193,46,83,126,231,135,186,162,113,212,33,158,229,75,151,170,252,44,239,17,42,71,85,62,198,207,41,252,93,149,191,39,96,44,30,29,107,105,138,90,171,97,1,97,153,114,78,235, +30,170,231,180,142,120,162,86,147,232,123,94,225,23,84,254,62,63,148,137,218,81,133,28,83,208,101,171,118,198,84,126,145,95,18,169,94,150,230,149,97,22,202,22,122,42,191,202,123,80,83,136,63,36,150,94,203,76,27,94,176,169,252,3,153,54,251,227,107,54, +166,242,250,120,42,18,182,67,61,121,18,5,177,91,111,136,24,122,82,112,166,201,185,88,98,18,78,71,196,153,29,54,6,123,244,152,37,209,152,194,28,193,95,58,98,54,55,33,17,40,241,100,117,12,229,157,202,63,228,215,21,254,145,202,63,230,159,168,252,83,126, +3,99,61,78,37,168,242,155,12,159,191,197,63,71,25,234,90,254,168,244,33,255,66,225,183,85,254,165,160,227,87,252,78,198,210,163,202,52,149,127,13,31,243,111,4,59,51,71,58,99,253,176,250,109,122,110,74,206,29,18,63,188,43,110,121,79,165,63,209,71,10,255, +86,229,223,241,245,42,191,207,119,34,183,158,120,91,64,249,155,233,145,144,71,205,183,104,236,7,229,140,103,109,247,229,248,12,229,178,148,169,165,77,77,242,156,127,138,87,4,40,28,113,202,28,78,127,82,105,217,200,59,130,233,35,38,229,28,179,167,150,186, +30,172,181,147,105,198,116,233,88,238,68,62,209,141,66,225,8,177,237,195,67,86,189,161,98,52,128,121,217,203,133,221,159,184,242,25,110,181,83,86,206,189,36,243,233,233,227,76,157,235,217,196,70,54,246,194,80,10,25,63,102,213,212,67,56,137,208,97,215, +28,206,230,10,5,103,124,204,93,6,206,204,80,223,214,47,22,130,254,11,93,206,230,101,39,185,12,153,226,146,190,144,142,240,8,11,38,183,175,46,107,130,70,169,238,176,110,73,249,131,14,7,166,190,112,90,4,111,105,153,92,146,76,30,158,153,236,123,195,113, +86,124,237,208,125,73,81,105,147,43,222,124,56,177,116,90,93,118,28,8,47,177,179,28,48,103,148,214,143,158,159,189,98,169,60,177,174,110,211,253,86,60,35,199,132,225,21,62,148,50,147,141,209,110,11,71,68,95,135,157,150,237,115,204,40,234,219,71,187,199, +85,159,34,55,201,228,166,50,105,94,9,19,122,224,178,81,198,200,186,219,103,92,129,20,156,28,65,37,195,78,78,213,206,97,218,137,254,186,246,100,60,146,178,12,137,167,225,155,100,31,42,3,248,209,131,45,34,247,10,96,3,164,25,58,206,78,113,233,134,57,186, +229,43,34,87,75,70,175,105,123,216,241,56,190,236,212,87,32,87,51,2,104,251,230,163,108,212,157,203,56,51,217,144,41,216,32,130,30,134,51,207,56,249,149,23,88,76,130,78,245,122,44,30,67,41,23,113,148,154,86,234,114,9,96,231,75,160,62,97,91,50,215,144, +67,119,31,147,71,117,202,198,164,155,22,182,94,251,100,115,74,240,201,220,177,4,79,120,114,149,35,119,92,96,101,135,98,78,12,21,231,100,171,225,87,140,211,221,207,247,162,213,148,161,161,244,77,145,244,250,37,28,155,237,235,160,149,99,66,230,168,75,37, +201,151,217,59,27,201,30,27,210,165,42,211,153,167,100,146,21,25,156,57,1,36,169,91,46,169,54,183,102,255,231,145,51,176,194,206,1,205,241,30,36,78,20,26,67,60,114,231,184,242,80,80,65,24,189,235,59,78,16,78,77,246,245,88,210,113,191,235,45,81,176,52, +215,4,195,111,101,138,92,7,16,82,93,122,114,93,60,97,52,70,140,40,50,51,0,51,46,102,244,90,233,207,145,27,102,54,102,21,152,209,185,233,242,69,119,58,183,177,193,33,55,142,186,172,169,201,181,193,176,139,168,19,225,101,170,27,45,169,128,35,113,49,106, +126,15,50,187,65,167,83,31,149,17,81,62,5,233,74,186,138,152,174,198,87,30,125,154,10,229,120,141,247,66,57,107,219,79,156,146,237,39,142,204,120,78,193,220,27,233,38,180,123,240,117,29,40,120,241,156,87,62,64,5,229,131,20,104,43,28,55,153,94,30,32,245, +48,141,47,175,56,76,74,121,229,97,242,149,87,29,166,9,135,108,14,159,67,123,26,249,208,206,197,74,141,166,210,25,144,97,30,205,166,18,188,157,73,55,99,164,220,161,73,183,208,173,68,246,155,200,196,246,155,72,149,103,191,137,92,30,244,126,158,190,128, +30,145,230,8,5,72,193,115,85,69,63,77,92,135,102,82,75,249,147,52,1,47,147,107,189,65,111,63,21,214,230,203,99,74,173,15,253,227,131,190,65,154,218,86,30,244,5,243,43,43,170,6,168,168,159,166,61,71,197,143,141,144,179,12,58,150,131,114,37,100,173,162, +25,84,13,201,23,216,114,174,117,184,101,229,92,69,95,164,47,65,162,124,58,155,190,76,123,65,37,64,75,232,54,216,215,131,181,229,116,59,221,9,205,102,64,207,125,116,23,102,205,165,153,116,55,222,124,244,53,172,246,98,229,215,177,6,231,85,71,31,110,66, +95,0,35,55,20,78,63,66,193,117,131,116,90,91,197,0,205,104,241,44,243,78,158,68,207,248,107,243,139,188,121,251,105,102,85,48,191,159,102,46,243,22,121,239,57,254,151,202,96,190,167,8,74,206,58,112,252,131,202,126,154,93,11,45,231,180,13,144,86,171,120, +150,249,139,252,65,223,209,251,104,193,100,58,30,244,21,249,23,95,115,132,78,175,45,8,22,244,211,92,239,189,52,46,168,76,90,208,79,103,108,13,42,210,53,111,235,110,63,31,56,254,122,80,233,167,146,33,179,172,161,201,104,183,66,236,139,104,34,181,1,26, +219,224,194,237,52,135,46,166,249,180,3,134,186,132,206,34,29,230,8,209,249,20,166,141,100,208,101,212,65,38,117,210,21,104,251,208,119,45,69,108,19,118,64,193,203,176,250,94,24,169,128,46,160,165,244,13,186,143,252,162,116,214,172,55,208,253,48,18,34, +6,171,30,160,7,33,197,68,218,69,223,164,3,48,107,33,37,233,33,172,240,130,70,132,190,69,15,195,172,171,192,245,219,120,243,225,185,138,14,210,119,224,166,92,3,63,66,143,166,1,243,12,70,4,106,45,229,176,107,126,75,213,83,116,38,195,55,211,7,105,126,91, +97,169,247,89,42,107,243,84,182,30,33,160,187,226,24,70,43,145,74,246,167,135,171,70,14,123,158,162,234,60,74,3,200,147,3,160,43,208,38,32,115,18,160,77,1,62,187,168,158,122,115,128,222,146,213,180,197,6,6,219,111,143,193,34,121,88,185,150,14,209,227, +160,247,4,201,101,19,167,123,158,68,79,174,78,135,169,63,173,211,179,176,128,112,109,172,122,145,234,203,43,7,168,166,214,91,37,168,95,112,23,45,6,32,22,110,45,92,164,216,162,87,180,182,121,209,177,184,181,45,191,170,181,205,23,244,138,42,181,249,143, +211,18,193,211,82,239,17,90,54,20,179,115,109,167,92,13,134,215,208,56,56,98,42,34,49,136,88,60,11,162,159,135,24,108,0,242,111,182,99,192,135,62,149,6,32,126,62,102,158,141,168,188,202,86,179,49,171,102,35,61,101,231,28,121,19,252,231,217,111,79,219, +113,146,171,212,32,28,228,40,245,19,60,37,214,234,6,105,57,176,124,150,4,247,217,251,104,49,30,181,45,85,71,151,121,61,203,242,139,16,13,247,145,86,85,148,191,168,214,23,244,245,211,138,125,164,86,6,125,79,209,202,60,218,186,59,31,72,126,183,114,200, +55,179,109,130,183,65,173,219,225,155,59,168,148,190,130,176,254,42,4,190,131,206,133,88,153,0,47,5,218,239,183,131,116,42,85,192,186,71,177,126,58,112,126,204,70,221,12,248,244,57,188,229,139,112,89,5,235,210,126,244,131,154,120,47,47,235,61,167,231, +73,244,124,215,54,237,247,240,123,158,94,112,210,41,191,3,46,5,232,255,16,136,58,103,31,121,15,13,82,113,91,69,225,170,1,58,119,29,183,12,210,121,109,190,103,169,174,205,83,184,26,174,43,172,135,227,224,191,134,214,1,106,116,242,219,26,228,55,184,238, +252,187,232,12,36,56,101,144,214,194,88,77,133,23,244,211,167,196,209,120,244,83,115,63,173,59,64,107,6,169,165,109,144,214,183,201,252,13,3,116,225,0,109,148,76,209,138,5,155,106,21,49,223,230,182,90,255,139,84,28,84,10,183,56,80,15,250,91,251,105,235, +86,228,21,73,8,23,181,28,160,105,14,219,109,120,29,231,188,94,220,2,216,149,229,50,223,49,146,185,12,22,94,130,151,67,208,189,8,241,252,16,114,136,60,159,64,14,113,192,118,9,21,163,221,15,235,223,11,139,221,135,77,231,126,123,198,98,68,125,45,226,126, +53,214,180,35,194,123,16,231,215,33,190,111,65,76,239,71,196,60,136,40,120,8,246,126,24,180,30,195,251,19,176,244,97,252,13,2,142,199,0,196,119,0,188,223,227,75,124,219,13,112,246,32,26,191,79,47,194,234,215,97,251,121,137,94,6,199,61,52,139,94,1,20, +253,224,150,160,87,233,53,120,185,150,118,210,15,232,135,240,178,100,149,215,233,71,232,59,108,191,253,216,134,246,135,89,207,127,8,168,138,231,167,208,27,244,83,27,218,69,232,121,195,134,118,158,92,102,165,55,206,109,248,18,216,159,86,120,233,17,186, +236,113,210,251,169,189,185,162,48,212,79,225,188,7,40,223,123,208,115,48,27,122,133,54,143,163,192,207,49,154,6,180,77,7,106,68,131,105,14,133,52,111,149,38,208,91,118,88,229,201,133,121,154,207,131,144,82,176,185,188,194,142,135,106,60,140,117,158, +85,179,42,177,9,156,94,110,195,171,114,214,34,224,107,128,188,178,129,96,91,242,28,220,237,145,88,193,212,133,67,66,56,241,255,34,12,244,18,88,189,140,96,120,5,38,123,21,41,236,53,36,252,151,105,17,212,20,161,150,128,93,9,102,189,77,191,132,216,19,16, +30,146,208,61,88,115,38,253,10,14,16,145,151,103,205,181,156,126,109,155,43,79,110,251,211,187,222,69,224,36,65,176,119,144,58,100,191,235,116,144,213,37,233,217,148,244,108,226,229,114,134,33,118,58,112,143,236,163,98,209,164,82,62,162,208,165,159,98, +64,233,27,131,20,7,196,187,219,134,141,13,208,21,3,148,64,1,16,244,74,87,50,232,27,32,75,224,158,58,64,227,29,224,167,130,202,177,3,199,111,23,166,187,164,211,111,191,5,253,199,14,65,163,29,116,57,96,65,248,89,246,51,128,92,120,19,158,55,193,74,55,141, +216,34,223,194,232,219,52,9,122,7,161,249,60,232,88,9,45,207,161,247,144,49,223,7,165,223,131,214,31,40,78,255,0,74,127,64,110,253,35,104,125,132,58,235,31,65,233,35,84,16,127,206,38,161,121,216,106,223,163,223,194,182,59,176,205,254,14,171,37,197,239, +205,218,113,47,125,144,222,56,246,130,170,192,110,18,234,163,15,65,213,3,25,246,128,195,31,33,123,38,183,182,97,252,79,224,224,228,214,91,208,39,16,41,153,236,69,77,209,82,81,133,90,162,109,153,247,110,154,80,89,101,87,18,61,7,142,255,25,96,232,69,20, +167,70,22,113,127,65,251,111,80,246,175,40,101,254,19,229,220,223,32,234,127,101,129,0,162,89,17,75,160,214,1,91,196,18,40,246,190,189,183,205,177,119,108,15,96,82,76,255,100,231,211,172,136,147,252,244,207,160,238,136,216,136,57,30,60,149,242,10,108, +104,254,161,82,196,103,19,156,97,51,212,156,41,244,47,105,134,10,253,107,218,38,10,68,148,205,52,187,183,128,248,95,233,223,211,33,82,131,167,204,202,151,196,228,78,90,117,38,56,164,177,248,63,160,235,232,197,190,83,91,252,55,24,200,89,92,155,78,2,62, +187,252,112,95,237,4,185,47,171,149,207,209,10,116,254,155,254,199,141,142,247,224,24,233,252,47,253,95,218,204,27,96,29,73,53,126,152,25,245,176,231,144,43,37,167,104,241,103,41,249,65,201,217,205,253,176,179,179,155,251,233,239,195,119,115,240,57,206, +228,234,206,60,119,54,31,239,206,187,114,220,9,172,48,115,158,155,49,216,157,246,9,140,65,121,44,60,243,216,139,58,64,242,110,30,221,193,69,168,11,112,172,178,231,209,255,3,80,75,3,4,10,0,0,8,8,0,22,178,149,71,221,192,76,137,196,4,0,0,149,9,0,0,45,0, +0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,66,111,111,116,115,116,114,97,112,77,97,105,110,83,116,97,114,116,101,114,46,99,108,97,115,115,141,86,89,91,219,86,16,61,194,178,5,170,18,192,108,49,4,112,2,20,155,197,78,83,74, +27,160,52,9,133,176,24,146,96,150,58,164,139,176,47,70,68,150,168,44,19,232,150,46,105,251,27,250,218,151,190,54,47,134,175,124,77,223,251,47,250,212,127,209,118,174,100,131,55,242,213,15,119,153,153,59,115,206,204,189,99,253,249,207,111,47,1,188,129, +31,101,248,113,87,70,47,102,36,188,47,97,86,70,43,230,100,220,195,188,140,5,44,242,97,73,134,7,49,25,203,88,225,195,253,122,60,224,146,135,245,88,149,16,151,48,36,163,17,107,18,214,101,108,96,83,194,7,245,72,112,55,143,248,176,197,135,199,245,248,80, +198,71,248,88,194,39,245,80,249,114,91,70,23,146,18,82,2,124,83,154,161,217,211,2,60,161,240,134,0,113,198,76,49,1,141,49,205,96,43,185,204,54,179,214,212,109,157,36,254,152,153,84,245,13,213,210,248,190,32,20,237,93,45,43,32,28,51,173,116,52,109,169, +41,157,69,159,90,234,254,62,179,162,119,77,211,206,218,180,89,86,53,35,110,171,150,205,172,73,1,222,44,95,10,232,15,109,197,246,212,3,53,170,171,70,58,26,183,45,205,72,79,186,18,205,140,206,105,58,155,116,240,168,86,154,34,180,212,48,22,32,187,33,231, +205,12,97,185,92,126,88,64,131,171,93,84,45,66,159,52,13,155,29,218,51,186,154,205,198,76,53,197,72,24,112,79,24,204,142,174,175,198,74,84,252,112,134,80,59,34,1,205,37,177,29,17,15,205,245,203,204,222,53,41,135,157,37,6,22,219,209,89,210,142,186,58, +178,108,47,79,220,209,126,49,121,173,149,110,167,134,166,185,231,217,195,36,219,183,53,211,200,74,224,165,216,209,140,84,76,205,25,201,93,102,57,100,122,66,21,121,170,100,46,238,104,78,117,84,203,234,39,7,91,85,122,157,25,164,16,22,4,212,105,180,144, +227,102,206,74,178,57,231,84,160,86,225,34,220,131,130,32,174,41,120,7,183,4,116,92,144,58,1,74,169,70,193,14,210,18,118,21,104,216,147,240,68,129,142,140,2,131,15,65,152,18,246,21,124,10,75,65,22,116,39,122,232,26,69,220,170,69,244,2,227,200,61,103, +207,177,40,200,225,128,208,243,212,19,173,138,236,41,120,138,67,1,77,231,226,251,219,123,84,9,9,71,10,62,195,231,69,100,133,52,208,133,215,181,109,142,226,11,5,95,226,43,5,207,240,53,241,114,195,143,22,195,143,70,134,30,19,121,75,194,55,10,190,197,119, +84,236,243,0,171,57,195,214,50,236,172,96,2,102,103,204,156,158,10,26,166,29,212,169,236,54,11,218,187,44,232,82,8,22,125,6,23,239,172,6,53,163,40,78,105,148,109,109,59,199,61,4,7,7,178,131,17,5,207,241,61,135,246,131,128,193,255,249,180,232,141,156, +3,43,65,228,181,205,245,85,42,116,83,40,92,122,221,23,38,203,43,181,80,176,140,85,89,198,200,178,173,34,215,197,90,183,166,153,29,63,202,218,44,83,254,176,138,30,42,79,56,175,146,217,15,84,139,25,84,239,112,177,7,20,35,93,112,138,55,130,146,186,174,237, +90,76,165,103,119,41,153,179,184,163,226,190,181,44,172,43,229,224,179,204,158,169,241,252,59,67,175,8,215,160,211,186,240,254,7,66,213,205,167,138,96,129,90,177,37,220,174,113,102,171,234,76,248,85,141,227,202,69,58,106,218,154,113,96,62,161,59,124, +171,52,140,123,223,203,194,20,68,225,106,145,128,190,138,54,82,131,164,147,8,186,158,92,207,27,97,40,92,213,75,36,34,189,162,242,6,92,158,254,179,38,221,84,41,163,51,25,213,166,135,64,30,219,106,165,246,17,17,220,49,45,50,170,32,88,35,143,53,8,158,69, +174,233,124,3,215,232,255,214,15,254,243,64,224,45,141,198,235,180,139,210,44,208,236,29,58,134,240,130,22,117,232,163,209,231,8,59,208,79,163,226,26,96,0,175,211,76,143,19,33,178,226,135,255,38,59,137,230,205,161,145,99,212,173,156,194,147,16,127,135, +152,240,140,230,225,205,195,23,63,129,148,71,253,49,26,38,196,19,200,1,49,143,215,2,162,95,201,227,210,132,55,224,245,95,38,235,198,132,167,5,77,241,60,154,39,124,1,159,64,18,127,194,51,76,251,150,205,23,14,90,14,167,199,9,19,160,112,157,180,239,194, +48,174,98,12,221,244,205,208,67,31,0,189,14,204,121,23,74,1,38,95,133,49,228,64,223,36,251,17,130,236,195,67,140,210,138,251,28,67,132,184,139,52,247,225,6,125,149,120,201,87,19,110,226,77,178,26,43,144,118,117,111,145,110,156,36,34,73,222,38,47,244, +79,80,200,221,49,69,244,209,188,116,138,214,196,176,191,237,24,237,121,116,44,143,188,156,246,140,139,109,98,247,207,232,29,105,19,111,114,170,121,92,241,7,242,232,252,9,190,128,247,215,231,162,240,203,191,127,157,162,43,225,191,90,36,124,130,238,99, +244,252,113,86,129,118,10,11,10,19,164,221,40,17,188,65,235,113,202,61,167,58,77,97,131,4,119,130,200,120,113,153,234,49,137,41,58,215,76,228,223,37,173,135,62,128,174,227,61,90,137,28,222,89,74,150,156,68,240,130,223,118,226,220,249,15,80,75,3,4,10, +0,0,8,8,0,22,178,149,71,72,214,183,36,211,10,0,0,35,24,0,0,40,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,87,114,97,112,112,101,114,69,120,101,99,117,116,111,114,46,99,108,97,115,115,149,87,121,96,28,85,25,255,77,178, +201,110,54,211,132,110,146,182,41,41,44,37,109,210,205,69,203,221,150,35,73,83,26,200,213,108,210,154,162,214,201,238,52,89,216,236,132,217,217,30,8,10,40,40,42,162,28,34,20,68,69,173,183,65,233,6,136,128,162,22,197,27,239,251,62,241,194,3,111,240,247, +205,76,54,179,219,109,13,127,236,155,247,189,247,189,239,248,125,199,123,251,228,115,15,63,10,96,189,18,242,227,45,126,220,17,192,91,131,40,193,157,126,220,21,68,25,14,6,161,224,110,89,185,199,143,183,5,112,175,31,111,15,226,29,120,103,16,21,184,47,136, +74,28,244,227,93,65,84,227,96,5,57,223,45,195,123,100,56,36,195,123,229,244,251,100,120,191,176,124,32,128,15,202,247,67,178,242,97,153,125,36,128,25,249,222,47,195,71,3,248,152,124,31,144,237,195,50,203,6,48,43,223,7,101,120,40,128,135,229,59,39,195, +199,253,120,36,128,71,197,138,199,132,253,19,65,156,142,79,138,157,143,203,236,83,50,251,116,0,159,17,31,142,248,241,132,240,28,145,157,251,100,246,89,63,62,23,196,217,56,24,192,147,242,253,124,0,95,8,224,139,1,124,41,128,47,7,240,149,0,190,42,203,79, +249,241,181,32,186,132,237,235,242,253,134,12,79,85,226,155,248,150,72,249,182,31,223,9,162,23,223,21,37,223,11,226,251,248,129,152,246,195,32,126,132,31,7,241,19,252,52,128,159,41,168,223,210,27,29,25,238,237,26,29,233,29,28,216,61,58,220,183,123,104, +120,112,168,103,120,100,76,65,168,239,50,109,175,214,145,212,82,19,29,81,203,76,164,38,54,41,88,210,109,164,210,150,150,178,118,104,201,140,174,96,101,158,128,174,206,104,143,71,66,254,230,80,231,200,54,207,230,138,188,205,232,182,206,221,27,206,60,107, +119,116,180,95,193,242,93,189,67,187,163,35,131,195,61,133,18,61,59,5,226,130,211,166,49,173,155,86,66,79,43,88,230,152,158,177,18,201,142,161,220,58,205,175,90,224,218,154,72,210,254,42,135,51,97,116,8,45,14,238,211,204,20,125,29,204,88,211,25,43,39, +202,70,161,115,122,90,79,197,181,113,155,177,60,102,164,246,36,38,20,172,235,51,204,137,142,9,83,139,39,245,142,125,166,70,38,179,99,167,243,237,182,121,50,166,102,37,140,20,15,213,236,49,76,26,116,153,30,179,182,36,76,142,134,121,64,193,197,205,249, +86,20,87,121,60,61,61,251,245,88,134,194,168,194,215,109,196,233,88,117,95,34,165,15,100,166,198,117,115,68,142,75,60,141,152,150,220,161,153,9,161,221,69,129,205,181,134,33,161,117,174,192,161,2,156,202,55,39,82,9,235,124,5,231,21,181,181,16,233,99, +120,176,67,129,66,97,117,158,237,158,253,49,125,218,69,199,103,77,38,24,189,198,197,57,186,108,218,212,167,53,83,223,146,72,51,59,199,51,34,100,212,76,40,56,161,121,157,163,32,165,91,29,163,195,189,18,172,180,145,49,99,11,241,94,216,9,230,12,72,251,241, +115,198,223,212,181,184,45,210,24,53,147,204,225,60,122,139,78,165,49,205,210,227,59,53,6,174,130,128,77,105,150,165,155,57,167,108,36,182,206,47,83,65,69,124,65,88,85,210,208,226,67,158,68,109,90,20,154,130,91,32,145,98,17,234,218,84,78,19,207,244,166, +152,163,206,242,38,63,126,193,168,79,232,150,23,15,130,193,149,188,44,84,208,210,252,66,82,214,175,219,144,19,187,75,155,47,61,186,37,20,147,212,43,45,34,153,44,186,215,101,24,22,237,211,166,251,53,241,72,51,5,37,113,208,167,153,19,68,164,166,136,14, +26,145,112,68,42,104,56,158,66,5,181,227,69,228,31,163,70,139,154,194,140,112,216,182,25,83,244,185,146,240,185,145,96,188,215,54,31,109,220,186,98,246,170,110,159,57,48,160,137,148,115,138,156,91,172,164,184,190,71,203,36,231,251,237,185,139,146,180, +171,168,168,128,169,95,145,97,215,137,179,10,119,41,40,219,235,136,172,99,25,25,166,213,159,72,167,201,183,224,108,48,106,215,140,83,255,181,5,245,215,46,242,21,172,254,255,149,74,23,188,41,174,160,185,128,223,33,219,92,178,125,161,67,171,152,196,47, +169,186,88,77,200,222,175,100,72,168,248,53,126,195,58,93,112,120,56,147,178,18,83,122,174,176,21,180,186,54,133,23,132,135,247,208,152,112,211,154,116,83,56,110,144,76,25,86,88,223,207,210,105,103,205,44,200,26,28,151,238,232,199,111,85,60,141,223,137, +194,223,179,106,23,89,61,42,118,227,101,42,198,176,75,197,165,120,177,138,151,224,165,42,14,224,74,21,41,24,42,254,128,63,82,89,220,83,175,93,90,90,87,241,39,60,163,226,117,184,73,197,159,69,93,30,199,144,102,77,170,248,139,112,252,85,54,235,188,155, +209,73,141,151,104,52,51,165,226,111,142,140,155,85,60,43,108,234,149,137,233,40,163,161,59,26,254,46,187,255,200,219,112,4,255,83,54,254,37,27,53,69,122,52,145,236,54,50,201,184,141,150,244,178,240,190,34,192,154,198,148,13,108,187,192,245,111,21,150, +248,250,31,17,252,95,60,167,226,121,206,20,192,96,183,138,231,181,238,164,24,252,250,249,124,113,91,180,138,140,176,46,47,204,231,174,76,34,25,151,210,246,103,204,228,48,43,89,85,20,165,132,153,221,81,0,152,83,129,74,27,61,242,46,239,208,205,180,237, +209,50,239,106,119,82,99,21,236,73,136,96,95,59,161,81,149,82,60,51,15,70,126,111,87,240,248,113,211,138,239,3,139,141,37,29,142,231,46,141,176,158,162,42,114,53,185,70,55,181,134,155,10,141,45,92,115,45,109,10,107,169,120,254,206,130,181,77,237,225, +145,73,61,173,135,247,37,146,201,240,184,30,54,245,41,99,47,21,166,13,35,213,30,30,74,234,12,123,56,147,118,77,147,110,202,107,173,125,13,83,244,105,197,231,87,202,4,189,114,21,183,10,254,203,189,245,234,185,98,24,78,197,175,42,1,165,194,175,4,85,165, +82,10,240,21,48,252,138,170,42,75,148,42,191,82,173,42,39,40,75,21,116,14,24,97,187,185,208,28,107,50,124,185,126,192,81,155,158,214,99,98,110,156,6,20,205,156,121,236,88,131,39,122,147,32,122,128,80,238,247,164,97,77,238,6,28,244,172,158,122,236,119, +212,124,139,229,69,83,218,44,99,185,93,236,105,155,220,149,87,242,14,43,57,156,203,189,120,207,245,222,82,78,143,40,222,190,235,138,221,24,84,95,157,46,188,168,151,54,231,63,77,132,171,166,224,58,151,226,101,67,108,46,170,170,38,93,140,185,80,132,148, +249,209,188,206,234,138,2,222,92,59,225,86,250,152,91,65,158,218,149,152,118,212,5,211,94,194,217,113,132,187,59,14,17,57,254,53,54,50,105,26,251,114,79,198,10,138,137,198,38,117,169,227,37,114,31,243,209,151,178,156,203,36,247,214,91,120,193,215,229, +216,163,78,190,197,120,128,97,44,179,12,226,202,184,106,246,139,84,65,219,162,110,115,183,209,200,253,105,25,243,185,177,249,5,165,196,81,111,194,218,98,207,99,5,167,121,165,118,79,106,102,148,23,182,158,138,233,121,102,229,253,11,89,90,144,242,246,75, +74,58,51,67,214,92,244,157,104,231,85,145,13,2,20,75,26,18,182,149,199,126,97,49,140,49,50,91,246,163,219,174,140,197,62,36,143,10,83,177,75,180,216,139,140,118,165,45,59,128,141,69,223,159,5,238,227,20,254,251,173,4,16,68,61,182,99,152,84,148,84,9,214, +147,30,241,208,43,72,143,122,232,6,210,59,60,244,201,164,119,122,232,83,73,191,200,67,175,69,72,110,118,206,67,114,185,219,95,222,239,246,151,215,62,191,85,168,128,134,113,158,136,145,26,64,57,79,1,43,231,160,140,205,161,100,44,18,42,157,133,111,14,101, +99,179,40,111,153,133,127,198,150,27,231,88,206,51,64,51,116,142,203,156,83,216,99,235,144,153,104,97,85,96,34,39,59,1,191,205,213,22,201,34,112,23,86,204,161,98,44,20,244,61,130,202,177,210,72,244,65,168,179,88,242,152,232,141,20,85,87,133,82,142,173, +20,210,70,24,58,60,106,219,92,215,100,230,168,133,188,185,28,181,202,118,158,40,227,202,108,100,22,85,20,93,77,209,39,28,198,210,72,235,97,132,34,45,135,81,19,105,59,140,218,22,26,117,39,110,107,105,125,16,117,145,7,184,61,139,101,89,44,183,167,161,21, +242,201,162,126,22,43,179,56,209,89,107,112,214,86,217,107,39,57,107,39,59,107,97,98,118,74,22,171,157,197,83,157,197,70,155,113,141,179,182,214,89,107,178,215,154,15,161,97,163,207,134,35,226,192,209,34,112,212,251,102,209,242,216,253,116,99,13,238, +194,61,88,231,2,177,21,75,57,110,128,143,235,213,56,29,181,56,131,81,63,19,39,225,44,174,156,131,8,206,37,181,17,189,216,68,56,54,195,196,121,184,1,231,83,70,39,165,92,128,123,113,33,178,232,182,1,60,131,208,220,139,229,184,12,151,83,30,65,66,18,83,54, +148,179,54,168,138,61,147,12,42,177,103,2,111,41,231,124,25,114,148,168,198,121,78,246,26,9,88,107,31,81,108,123,2,245,118,230,60,128,154,44,218,185,210,193,12,202,226,180,153,150,133,96,134,108,109,91,169,253,34,168,180,116,53,46,241,4,180,209,181,162, +140,249,61,141,43,104,133,73,202,199,111,154,251,86,78,247,118,123,13,16,216,67,161,245,89,108,56,130,165,115,56,157,89,187,126,22,103,204,226,204,25,90,117,86,97,14,13,81,229,118,166,232,136,173,82,117,68,184,42,189,138,50,57,69,207,50,217,229,228,13, +74,223,28,206,102,2,157,19,9,157,75,13,89,108,12,109,226,16,9,109,118,169,243,108,234,252,60,234,2,151,186,144,67,22,157,20,209,69,17,221,253,173,161,45,101,78,246,19,170,232,152,47,180,62,154,69,207,78,82,181,173,89,108,125,8,23,149,96,231,33,84,246, +219,238,108,219,41,158,181,136,83,180,175,132,150,102,114,41,177,150,133,6,22,126,9,3,213,195,16,245,179,184,227,44,111,147,99,134,229,189,151,94,92,77,111,197,223,8,253,235,103,162,236,197,62,242,239,101,117,72,240,5,246,27,92,12,74,240,106,236,183, +155,200,2,26,65,249,71,224,162,241,74,98,33,225,91,53,135,222,49,2,124,113,127,11,237,189,132,191,190,67,8,14,200,183,141,121,91,66,163,170,80,71,198,58,198,181,46,23,132,149,4,83,186,65,5,213,86,81,97,136,217,84,199,111,3,225,22,3,195,54,212,171,114, +69,189,202,206,63,233,37,181,120,57,174,178,93,119,204,186,154,63,190,237,220,254,178,129,95,9,101,192,169,173,254,194,78,149,241,132,59,224,186,170,208,153,107,220,243,29,238,249,50,57,95,120,248,42,207,225,178,220,225,107,113,157,139,73,146,70,75,151, +9,181,58,218,7,54,250,218,90,234,153,246,131,247,23,100,223,53,196,242,90,150,240,117,185,2,148,114,152,47,187,16,94,69,244,21,123,118,61,35,82,98,207,94,131,215,242,108,144,102,223,72,80,124,57,0,36,254,252,55,226,58,176,217,45,197,64,164,69,97,239, +56,165,208,135,235,61,37,22,200,105,12,224,13,118,172,69,210,77,174,164,173,148,84,234,72,106,45,38,233,70,79,160,142,150,36,179,55,114,86,98,203,188,217,149,121,11,169,50,187,81,176,88,217,21,54,108,244,213,251,142,160,188,222,55,211,122,4,101,173,51, +171,238,68,69,132,249,189,109,70,89,208,183,154,178,64,187,130,148,88,77,89,33,188,153,30,220,194,139,241,54,38,204,237,220,191,195,131,99,99,206,150,198,156,45,141,174,45,50,123,19,79,11,142,43,41,97,216,70,235,214,28,122,67,238,245,212,96,55,226,161, +50,183,17,143,249,236,234,116,175,167,2,28,238,246,32,218,144,211,221,224,234,86,104,163,240,223,254,63,80,75,3,4,10,0,0,8,8,0,22,178,149,71,132,26,164,171,178,10,0,0,66,24,0,0,42,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101, +114,47,71,114,97,100,108,101,87,114,97,112,112,101,114,77,97,105,110,46,99,108,97,115,115,157,88,7,120,20,199,21,254,7,78,218,211,106,85,56,9,164,195,148,3,11,212,144,206,128,141,177,192,16,89,18,32,144,16,160,102,129,109,188,156,22,233,240,233,86,220, +237,81,226,150,98,167,216,137,211,72,177,147,56,61,78,226,20,156,56,39,217,138,77,236,20,39,78,119,122,239,205,233,189,59,249,103,119,117,58,221,45,66,95,190,15,205,237,188,121,253,189,121,239,13,79,62,243,240,163,0,214,139,141,42,182,225,46,21,27,240, +50,185,188,92,46,175,80,240,74,21,5,18,92,128,87,41,56,227,199,171,253,120,141,220,189,86,197,235,112,183,31,247,248,241,122,5,111,80,81,38,177,202,240,70,121,120,175,138,55,225,205,10,222,162,162,210,1,191,85,197,14,188,77,242,124,187,92,222,33,151, +119,170,184,15,239,82,240,110,5,239,241,227,126,9,122,175,138,229,120,159,130,247,171,88,133,15,168,88,134,179,10,30,80,81,35,185,220,135,15,42,248,144,31,15,170,168,197,135,85,164,49,33,191,38,229,242,144,92,30,246,99,202,143,143,168,240,227,17,185, +127,84,193,57,21,31,197,99,42,30,199,199,84,124,28,159,80,241,73,60,161,224,83,10,62,173,98,51,158,84,241,25,124,214,143,207,73,154,207,251,241,5,5,95,148,159,95,146,135,79,201,195,47,75,70,79,249,241,21,201,232,171,126,124,77,193,215,165,45,119,201, +229,27,126,220,46,127,191,233,199,183,84,124,27,223,81,240,93,63,190,39,137,191,175,226,7,248,161,92,126,164,226,199,248,137,138,159,226,103,10,126,174,162,15,191,16,168,218,121,160,181,189,171,227,112,127,111,199,129,195,187,122,186,59,14,247,236,235, +235,236,217,43,16,232,58,166,159,208,195,49,61,62,18,238,181,18,209,248,200,22,129,146,54,51,158,180,244,184,53,160,199,82,134,64,40,143,188,189,163,175,181,179,171,163,61,195,167,194,69,217,223,223,217,209,151,129,46,155,5,205,35,42,220,26,141,71,173, +109,2,11,235,234,7,4,124,109,230,48,165,149,117,69,227,198,222,212,216,17,35,209,167,31,137,25,82,73,51,162,199,6,244,68,84,238,93,160,207,26,141,38,5,214,118,153,137,145,240,72,66,31,142,25,225,147,9,125,124,220,72,132,119,218,219,65,103,215,173,71, +227,52,202,55,198,95,129,37,117,135,242,77,182,165,235,137,17,242,171,240,56,22,80,93,206,187,245,132,64,169,131,17,53,195,59,162,49,131,167,165,227,9,147,135,86,212,72,74,136,128,146,48,77,171,61,74,220,194,113,61,145,52,248,177,58,91,207,72,44,26,110, +51,199,198,244,248,176,52,118,159,141,67,70,69,17,51,126,130,140,36,193,101,185,4,189,167,147,150,49,182,47,35,42,139,65,219,52,25,121,40,230,184,21,101,252,60,68,218,114,134,179,232,136,94,158,204,97,75,23,57,246,165,172,104,44,60,3,151,118,58,188,250, +169,236,46,115,140,118,22,198,204,145,17,169,236,69,94,81,232,178,15,73,87,230,66,58,78,25,145,148,101,18,191,198,11,127,112,54,150,116,123,199,169,136,49,109,78,133,62,60,156,235,3,129,149,117,179,163,49,123,39,3,171,58,98,28,141,87,228,160,215,231, +198,114,145,171,77,182,140,242,186,60,52,65,94,203,29,96,220,176,194,253,7,58,123,79,199,45,253,84,70,97,226,248,99,76,91,249,157,73,25,23,85,186,210,21,51,96,36,146,54,70,229,180,140,156,171,120,194,65,112,238,3,85,73,24,73,51,149,136,24,173,73,226, +24,250,152,192,226,140,110,157,241,241,148,229,128,73,170,29,73,69,99,195,7,140,136,17,29,183,50,104,54,251,108,45,55,212,93,56,77,242,204,223,62,47,162,185,114,66,237,181,205,112,238,203,146,188,11,219,44,5,106,184,6,215,106,24,193,45,26,110,198,77, +26,142,225,38,86,163,11,93,36,13,191,196,211,116,85,174,59,25,53,254,149,59,164,77,41,98,54,141,50,41,52,252,10,191,86,240,27,13,191,197,239,136,115,92,160,224,120,42,106,208,103,27,255,143,43,168,225,247,248,131,134,63,226,79,10,254,172,225,47,248,43, +147,106,230,66,237,210,147,163,221,250,184,134,191,225,239,26,254,129,127,106,72,226,14,13,167,241,108,13,22,238,84,240,47,13,255,198,127,4,150,122,184,175,83,214,229,88,140,23,206,227,176,221,60,25,143,153,250,48,107,128,115,114,82,195,243,113,155,244, +226,51,179,221,54,77,177,79,183,70,91,147,73,99,140,21,53,33,241,254,203,133,46,64,173,7,242,85,172,105,73,139,27,25,159,94,75,183,141,21,66,44,96,170,101,167,7,205,117,40,155,103,202,162,100,187,80,17,62,77,20,136,66,77,40,140,168,240,83,53,81,132,219, +88,70,174,97,184,19,53,2,197,217,36,66,21,197,146,78,99,185,152,79,141,87,68,137,38,74,69,153,34,202,53,177,72,4,20,81,161,137,74,177,88,17,75,52,81,37,170,233,180,57,238,43,253,61,147,47,7,82,113,43,58,102,100,14,165,26,65,69,44,213,196,69,82,95,223, +81,154,169,137,101,98,185,192,182,54,61,30,55,173,208,176,65,119,140,49,17,66,145,152,158,76,142,211,179,161,163,102,34,228,170,27,98,231,8,29,77,152,99,161,8,155,220,17,61,105,132,106,215,36,107,155,103,165,105,207,145,99,70,196,210,196,10,177,82,74, +12,105,98,149,20,23,12,219,55,185,41,225,92,229,89,62,90,45,46,102,104,247,154,33,27,37,228,162,132,166,171,4,85,72,197,135,41,165,210,171,164,107,162,70,172,209,196,90,81,43,176,137,60,220,90,19,138,219,197,38,148,28,55,34,209,163,81,99,56,20,141,159, +135,127,179,34,234,52,81,143,107,89,158,61,202,11,35,215,102,166,72,55,219,67,211,62,113,229,53,75,99,27,20,209,168,137,117,162,137,215,81,144,109,88,19,151,224,54,69,172,151,247,227,22,58,225,188,197,68,82,111,144,237,33,22,51,79,246,199,111,136,243, +26,244,76,55,141,154,186,250,249,52,222,66,211,213,247,114,207,241,96,14,22,61,211,117,116,142,178,212,227,50,47,30,213,147,173,137,145,212,152,17,183,46,164,90,134,175,156,9,142,70,71,82,9,94,172,53,121,101,55,223,24,217,242,10,236,169,99,190,214,120, +142,5,89,100,118,209,99,43,26,49,172,236,174,88,61,221,177,242,7,5,197,157,99,4,174,154,71,163,200,226,194,202,184,165,62,103,47,135,168,148,213,42,171,94,160,46,23,151,198,174,190,240,40,65,101,121,23,7,115,59,187,83,173,118,123,78,16,182,233,173,196, +143,15,203,121,211,187,155,229,79,44,179,237,205,233,122,249,177,240,30,69,23,229,14,41,132,93,55,39,99,175,86,49,221,14,60,79,103,85,126,91,128,98,216,86,208,33,135,188,178,198,83,132,211,141,60,207,188,186,133,45,231,226,243,187,59,203,5,13,30,44,115, +187,239,46,38,80,76,14,69,21,204,204,11,79,134,249,121,101,103,180,158,224,109,116,50,161,40,179,151,45,212,176,246,234,114,100,212,18,198,120,76,151,163,74,34,201,131,205,117,243,10,163,215,48,87,59,63,82,154,95,54,3,109,147,237,196,177,145,214,89,108, +16,172,11,237,166,243,154,89,61,125,7,147,140,93,34,106,157,14,231,226,80,236,138,185,49,28,63,200,183,151,51,146,241,217,150,199,117,230,148,252,170,207,119,198,10,71,78,93,153,169,55,51,55,59,45,183,107,203,244,164,224,238,89,168,44,147,173,56,15,83, +78,200,213,217,206,234,27,77,152,39,157,123,56,48,155,73,167,19,182,222,200,168,97,191,72,140,227,41,61,70,127,45,206,38,119,26,235,150,250,131,68,96,33,24,211,25,199,43,60,130,113,200,131,198,43,144,139,61,104,237,59,100,39,144,53,234,132,235,64,222, +168,94,239,69,119,158,241,221,231,140,114,213,117,158,231,82,90,241,76,65,62,205,135,240,249,121,207,86,190,194,131,31,35,17,137,153,178,101,52,204,157,163,179,3,145,219,243,242,106,59,131,195,158,55,221,255,60,221,198,152,108,245,84,253,66,188,51,29, +114,237,252,48,249,32,163,195,220,255,210,240,26,112,119,206,122,221,118,153,230,13,169,113,198,161,238,96,253,0,86,97,3,182,1,240,33,136,1,12,114,68,190,154,187,5,40,226,126,40,107,175,114,127,48,107,95,194,253,161,172,125,41,41,132,124,214,112,189, +142,144,48,228,184,13,20,52,76,64,60,96,163,28,230,90,104,3,87,224,122,174,154,131,0,29,71,248,91,132,8,134,137,69,98,113,134,226,138,9,123,124,18,11,186,26,39,177,176,155,139,111,239,20,10,134,38,80,216,226,11,250,210,80,6,131,190,130,71,224,31,90,24, +40,234,29,242,5,212,222,52,138,211,208,102,192,37,18,92,42,193,131,83,40,35,101,121,75,65,176,64,210,46,10,250,26,210,8,180,20,78,162,162,69,9,42,132,22,78,161,146,40,139,211,88,146,70,85,144,39,213,45,254,160,191,105,18,65,185,89,218,82,180,46,88,52, +137,139,90,212,160,218,48,133,101,67,193,162,41,44,231,26,88,49,137,149,19,8,77,97,213,80,208,63,129,213,19,184,120,10,53,228,181,38,141,181,51,150,239,70,128,235,26,58,122,45,109,173,165,195,234,81,133,6,44,71,35,46,197,58,236,66,51,246,211,109,87,99, +61,189,179,17,6,161,167,176,9,183,98,51,110,71,11,94,130,173,56,131,43,241,24,90,109,239,141,59,30,34,222,81,59,124,143,242,57,57,74,143,22,225,33,68,249,37,67,242,32,31,150,163,88,72,57,247,227,6,196,136,181,31,199,49,134,56,189,126,61,189,110,146,75, +33,57,92,75,104,2,10,101,181,113,40,29,133,159,210,54,241,209,150,34,183,51,212,235,4,78,50,34,167,108,57,2,221,252,230,171,206,13,116,132,188,22,240,183,150,190,156,66,237,80,67,160,110,2,245,147,160,131,171,92,80,99,22,104,198,33,165,84,12,104,71,5, +58,232,146,29,182,81,75,28,86,184,145,74,192,254,58,102,27,165,202,23,178,43,240,50,55,179,138,201,174,209,249,119,54,39,191,58,179,242,171,216,246,11,200,226,230,12,139,86,23,175,202,86,56,141,117,252,107,10,52,7,194,105,92,50,129,245,185,236,186,179, +216,85,101,216,241,245,238,178,187,151,174,147,122,239,174,192,134,52,54,166,113,105,26,151,165,177,105,207,125,40,233,154,194,230,161,198,9,92,113,142,50,90,2,91,210,216,122,15,170,37,48,112,165,239,17,108,27,90,216,208,59,137,237,19,120,214,57,87,153, +214,9,92,117,214,150,85,78,223,92,238,106,178,130,50,128,94,194,6,8,237,67,37,250,153,58,131,76,162,171,121,127,15,102,188,87,201,144,221,138,231,144,190,156,73,243,92,60,143,112,191,124,45,187,186,62,205,16,22,240,119,128,186,6,218,210,104,223,211,240, +4,74,108,125,58,28,37,118,48,117,119,118,53,82,147,93,141,129,206,52,118,119,175,155,198,216,35,49,214,237,229,81,87,211,217,22,121,135,186,130,190,115,123,236,179,189,188,232,61,231,200,125,37,182,208,193,210,201,109,246,47,176,157,201,223,205,239,221, +246,175,99,207,6,250,19,252,42,162,230,37,44,1,85,76,164,149,76,197,26,166,115,35,125,27,166,151,175,96,212,183,48,109,119,51,97,247,48,89,165,141,13,148,208,72,75,111,167,237,178,74,181,226,5,120,33,225,43,9,125,17,147,88,16,179,152,30,120,177,29,163, +36,238,112,237,222,103,167,46,253,216,16,40,74,99,223,221,168,116,146,149,155,253,105,28,144,62,159,68,239,76,228,157,236,180,40,33,133,165,76,255,153,12,88,97,95,27,201,221,194,157,46,247,205,46,247,210,41,244,145,105,9,37,76,160,63,55,143,110,204,226, +82,234,114,17,188,106,18,235,165,255,3,80,75,3,4,10,0,0,8,8,0,22,178,149,71,217,206,17,120,160,6,0,0,180,14,0,0,34,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,73,110,115,116,97,108,108,36,49,46,99,108,97,115,115,157,87, +107,119,27,213,21,221,215,26,89,138,60,73,28,1,1,81,135,4,48,32,43,216,74,12,9,36,78,66,19,59,128,65,49,33,78,226,198,77,91,198,210,32,143,51,158,81,71,35,39,161,15,160,188,194,35,208,2,165,152,119,31,16,104,75,27,90,172,56,164,13,143,118,173,174,213, +126,236,71,126,5,127,160,101,31,141,100,203,178,226,38,245,90,62,247,222,51,231,158,179,239,57,251,62,244,207,255,124,114,30,192,70,252,125,25,186,113,88,196,119,68,124,87,196,247,68,60,32,194,136,161,7,99,17,100,99,136,34,23,129,25,67,12,99,50,120,80, +122,249,40,198,165,181,68,51,33,226,136,8,91,196,100,12,163,112,162,112,101,80,144,193,247,163,240,196,186,24,131,143,146,104,166,218,112,20,199,196,224,184,12,31,106,195,15,240,195,54,252,8,63,22,241,112,20,143,136,250,209,24,126,130,199,98,120,92,226, +140,226,137,40,158,140,226,41,233,158,16,241,180,204,127,38,70,180,207,70,240,92,4,39,35,120,94,161,125,202,176,59,109,55,107,216,163,86,225,78,203,54,21,86,100,38,140,41,35,109,185,105,25,247,41,180,137,77,206,42,250,3,150,167,112,89,109,228,89,99,37, +223,114,157,3,158,61,55,201,49,253,244,129,125,131,156,180,74,204,178,174,243,160,149,47,121,134,216,41,116,101,92,47,159,206,123,70,206,54,211,71,61,163,80,48,189,244,72,208,246,215,155,114,126,162,49,204,240,184,209,187,105,243,112,105,82,33,30,4,179, +13,39,159,30,166,129,147,231,132,86,127,220,42,118,110,80,232,104,22,101,208,41,250,134,109,139,221,54,203,177,252,29,10,143,39,151,50,92,152,132,102,163,218,90,47,122,81,139,81,119,29,84,208,250,221,28,179,190,50,99,57,230,80,105,114,204,244,246,27, +99,82,135,120,70,202,114,208,240,44,25,87,149,154,172,82,1,10,250,160,227,48,130,109,20,139,38,53,215,44,177,152,206,141,92,183,70,103,44,84,123,178,171,177,190,49,127,178,48,87,253,80,78,138,220,98,117,42,92,30,24,50,251,118,122,208,55,185,10,215,19, +243,73,195,59,98,122,129,249,114,199,52,115,197,1,247,168,99,187,70,78,65,141,18,153,239,22,50,230,148,105,147,47,68,214,94,231,38,195,130,10,22,207,117,125,133,213,11,87,120,188,80,91,229,186,134,41,219,22,66,222,33,40,118,31,203,154,5,201,107,49,130, +23,8,182,182,174,74,126,239,27,155,48,179,18,105,217,176,149,119,12,191,228,209,235,206,197,6,117,113,200,213,108,201,243,76,199,79,247,51,83,2,164,89,216,97,183,228,101,205,96,241,122,53,191,61,98,198,18,238,118,178,182,91,100,97,247,152,254,184,203, +115,224,167,58,126,134,23,117,108,193,86,29,27,176,81,71,175,136,91,112,171,142,77,216,172,227,54,220,174,163,15,47,209,87,125,40,29,47,99,183,194,149,141,132,217,85,178,236,156,233,233,248,57,94,209,241,11,188,202,122,245,184,71,116,76,203,184,15,175, +233,120,29,111,232,120,83,196,91,162,123,27,239,40,132,123,10,134,231,235,248,165,168,127,133,95,51,90,173,98,116,186,78,60,253,38,130,119,117,188,135,83,58,222,199,7,17,252,86,199,239,240,123,29,31,226,15,58,254,136,211,17,124,164,227,79,248,115,4,31, +235,152,17,63,101,236,231,97,48,96,218,166,47,78,72,27,38,212,245,142,211,221,25,204,70,112,86,199,39,56,23,193,95,116,252,21,231,153,185,3,206,67,86,161,32,182,36,192,58,223,165,225,167,248,76,199,231,248,66,199,223,196,229,128,44,186,99,41,30,147,77, +141,53,84,88,179,100,17,9,114,126,202,28,105,20,174,190,112,28,130,205,122,166,225,155,3,228,158,194,150,166,7,69,211,45,190,104,111,133,146,178,199,151,231,77,127,175,33,176,2,226,68,56,30,50,38,205,70,218,206,31,102,226,219,225,126,234,78,54,57,53, +22,169,170,188,224,196,168,239,6,42,133,235,147,205,78,173,198,227,167,205,42,14,212,74,87,129,203,13,220,106,21,3,156,43,137,115,231,88,209,181,75,190,185,215,240,199,153,24,35,155,53,139,60,103,55,240,164,205,92,242,9,218,100,25,243,185,106,205,9,153, +204,249,32,27,37,72,243,236,215,130,52,189,82,50,110,62,95,201,198,130,236,85,183,252,82,217,75,92,208,25,83,99,187,76,234,21,205,234,113,112,30,114,175,64,222,118,233,144,7,107,27,178,239,2,59,96,254,136,141,230,230,186,107,147,13,87,209,130,140,10, +174,40,73,71,162,237,119,121,35,55,240,65,42,93,131,125,203,255,134,221,48,121,241,161,190,98,161,134,177,173,234,165,193,147,62,217,213,252,50,137,47,214,114,123,140,27,197,33,243,24,93,104,78,165,169,193,188,85,96,118,95,10,76,174,241,166,139,220,188, +1,221,7,234,158,28,117,183,229,252,195,70,175,31,207,67,219,36,208,238,191,8,104,245,204,185,152,13,90,11,176,89,2,244,253,223,111,150,122,87,183,93,114,26,229,12,11,142,196,33,243,168,168,176,142,15,201,30,62,67,210,104,109,111,151,187,13,96,219,91, +109,121,195,85,90,94,114,149,150,247,92,165,229,69,200,231,116,136,255,125,216,198,217,219,217,219,139,22,68,216,222,152,90,63,3,149,186,121,6,45,169,238,25,132,82,9,109,6,90,42,17,158,65,56,149,104,157,65,107,234,12,34,31,209,178,5,59,40,91,57,31,140, +124,7,165,94,233,223,136,111,162,31,242,56,226,77,66,43,122,111,241,17,166,37,212,91,231,16,61,148,250,24,45,101,44,59,135,216,161,51,104,11,70,122,25,203,227,43,40,202,88,121,134,143,21,106,67,101,172,154,198,154,245,101,196,167,177,154,10,37,202,224, +195,101,179,184,252,116,48,51,254,26,34,218,41,104,161,237,29,211,152,88,210,255,21,115,254,135,186,203,88,61,34,62,103,113,101,213,48,126,21,63,83,165,149,145,160,85,25,87,7,223,191,33,186,238,179,232,8,161,59,112,182,102,164,134,102,22,215,12,241,211, +90,133,173,90,66,59,11,94,170,211,216,46,189,107,21,62,67,116,107,184,33,198,117,140,145,8,115,1,1,148,106,144,68,120,22,215,143,156,250,239,167,85,191,52,232,44,227,6,137,198,255,214,89,86,101,161,155,155,2,168,45,129,163,120,50,24,134,26,253,86,29, +16,102,87,93,254,184,192,27,152,191,173,90,37,180,54,139,20,115,188,126,36,161,157,174,176,66,170,58,138,213,148,189,72,146,67,91,200,162,12,185,115,152,189,7,200,156,19,100,205,73,242,230,67,86,246,60,173,255,129,157,248,55,118,225,43,244,171,56,6,84, +7,223,15,107,113,151,186,29,131,106,2,247,168,227,200,168,147,216,163,94,193,144,122,157,60,19,166,236,227,175,160,19,236,221,73,166,134,56,115,61,238,98,47,140,47,201,153,187,49,8,77,184,82,229,81,82,77,225,30,126,85,56,172,118,225,94,98,105,97,188, +127,97,15,134,16,162,231,85,184,143,95,53,122,14,24,24,124,187,159,126,247,81,163,81,51,220,190,147,126,247,7,92,228,94,81,21,158,134,83,101,220,124,122,9,34,135,171,0,230,220,80,30,168,216,31,196,72,165,253,22,14,85,190,141,226,219,76,0,248,115,145, +59,26,149,191,175,1,80,75,3,4,10,0,0,8,8,0,22,178,149,71,106,32,106,144,180,1,0,0,86,3,0,0,56,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,80,97,116,104,65,115,115,101,109,98,108,101,114,36,76,111,99,97,108,68,105,115, +116,114,105,98,117,116,105,111,110,46,99,108,97,115,115,149,82,91,75,27,65,20,254,206,102,221,213,116,171,113,181,182,218,91,180,121,136,107,235,218,226,91,75,65,18,4,33,180,133,22,31,124,40,76,146,33,78,186,217,13,147,77,139,255,74,193,80,240,161,63, +192,31,85,60,51,134,210,168,16,124,216,153,115,251,46,115,216,203,191,23,127,0,188,197,171,57,204,96,173,8,15,79,77,244,204,28,207,125,188,244,81,38,248,109,53,200,143,84,159,48,223,232,138,159,34,86,89,188,175,18,249,126,220,170,43,77,240,242,99,53, +168,236,16,54,26,153,238,196,29,45,218,137,140,127,105,209,239,75,29,127,17,249,241,222,96,32,123,205,68,106,198,121,31,84,170,242,143,132,189,234,244,241,73,209,201,108,243,144,224,214,178,182,36,44,52,84,42,63,13,123,77,169,191,9,6,18,194,70,214,18, +201,161,208,202,228,227,162,107,140,18,22,109,175,206,246,181,106,14,115,149,165,132,224,32,77,165,174,37,130,165,121,100,119,170,181,202,45,18,126,91,216,145,249,255,37,187,158,82,117,243,230,238,138,60,199,91,53,25,39,95,179,161,110,201,235,36,156, +16,217,54,184,0,69,60,8,16,96,61,192,28,102,3,248,152,245,177,65,120,119,127,143,236,198,90,73,68,218,137,63,55,187,178,149,19,10,85,179,202,242,52,54,172,243,159,225,241,63,83,64,104,60,112,20,26,67,64,169,100,44,218,14,111,18,15,249,156,231,236,59, +28,184,124,47,71,91,35,80,244,27,78,244,122,132,66,244,102,4,247,140,235,14,22,44,135,153,81,204,212,101,212,15,44,33,65,137,43,101,102,99,44,22,249,131,141,140,150,99,35,163,110,180,30,97,101,172,21,243,77,124,207,68,231,40,156,254,35,247,108,81,91, +194,224,122,96,76,72,120,124,39,216,189,9,62,185,3,236,224,137,61,87,217,45,248,237,196,157,23,252,18,186,2,80,75,3,4,10,0,0,8,8,0,22,178,149,71,146,99,74,27,25,8,0,0,75,15,0,0,33,0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101, +114,47,68,111,119,110,108,111,97,100,46,99,108,97,115,115,133,87,137,127,20,103,25,126,102,179,187,51,59,12,57,22,18,88,40,144,166,13,108,238,34,10,146,180,212,36,144,118,219,52,193,44,9,93,80,113,178,59,217,44,221,204,108,103,102,9,84,109,189,170,245, +110,181,30,85,164,94,21,91,143,150,182,108,40,208,226,85,84,60,90,173,86,91,252,23,252,23,212,231,155,221,236,17,86,204,47,249,142,247,251,222,227,123,159,231,123,231,203,149,127,159,127,5,192,118,252,83,101,99,133,176,3,57,209,220,47,26,91,101,227,40, +112,85,228,113,76,198,162,10,5,199,85,156,192,3,42,62,132,15,139,230,35,98,207,131,42,30,194,71,101,124,76,198,199,85,52,227,19,42,154,240,73,21,15,227,83,98,249,211,10,30,81,241,25,124,86,52,159,83,241,121,124,65,197,23,241,37,209,60,26,162,237,199, +20,124,89,197,87,240,184,140,175,42,248,154,138,205,248,122,0,222,207,68,187,130,111,168,120,2,223,84,241,45,156,84,176,83,76,190,45,140,156,18,146,83,10,158,84,240,29,5,223,85,240,61,5,223,87,240,3,5,79,201,248,161,138,211,248,145,140,167,101,60,35, +227,199,18,32,65,139,153,166,97,143,102,117,199,49,28,9,29,241,19,142,107,44,236,183,173,156,97,187,25,195,225,232,248,137,225,188,59,111,152,110,38,169,187,150,45,161,113,255,212,228,29,83,251,226,241,35,163,119,78,79,220,45,65,138,73,88,61,106,153, +142,171,155,238,140,158,205,27,13,34,74,9,171,70,166,199,198,246,77,29,137,199,14,237,163,104,91,179,132,96,214,74,167,13,90,217,56,110,217,233,129,180,173,167,178,198,192,162,173,231,232,113,96,220,91,28,146,208,196,121,86,56,204,88,230,132,190,96,72, +8,143,31,213,143,233,3,89,221,76,15,196,93,59,99,166,185,45,92,181,109,198,176,29,118,116,113,107,198,204,184,123,36,140,68,175,227,227,90,115,215,74,186,102,36,248,71,173,20,221,55,141,103,76,99,34,191,48,107,216,7,244,217,172,23,144,149,212,179,51, +186,157,17,243,146,208,239,206,103,152,199,77,245,28,239,181,22,205,172,165,167,24,247,13,73,203,156,203,164,243,182,177,50,193,222,9,26,162,194,179,146,42,41,72,216,18,45,6,103,26,238,192,244,84,172,20,106,198,26,24,203,100,13,47,76,89,79,165,108,195, +161,239,198,218,173,68,33,101,56,110,198,44,217,110,172,213,149,160,238,59,158,52,114,98,209,145,241,19,9,205,203,110,99,166,107,216,166,158,101,60,121,59,187,194,240,56,53,27,243,142,97,15,167,141,18,232,204,252,108,126,110,78,128,235,59,60,194,144, +204,252,194,148,33,194,111,202,217,86,90,68,55,106,229,133,81,82,230,46,90,181,242,174,132,182,114,60,147,121,55,151,119,153,122,67,95,160,117,63,115,196,120,215,215,120,37,203,76,35,41,130,229,14,95,134,235,173,101,253,152,89,173,30,38,56,201,124,86, +119,141,233,229,40,37,172,141,118,213,163,145,74,128,202,244,81,197,134,25,195,76,9,174,175,42,78,74,75,45,149,165,10,219,44,167,72,208,144,229,84,11,135,237,228,60,141,197,173,188,157,52,68,170,121,71,150,25,208,47,236,104,216,139,113,13,183,227,61, +26,134,49,162,97,84,52,119,99,156,137,157,119,221,92,127,78,80,67,4,47,227,167,26,126,134,103,37,236,185,14,173,110,254,255,119,87,184,124,78,198,25,13,207,227,5,25,47,106,56,139,130,134,37,156,211,48,141,9,25,47,105,56,143,11,228,231,114,78,71,60,64, +141,84,53,54,196,164,154,66,213,75,194,193,69,209,188,44,227,21,13,151,240,115,13,41,240,232,170,56,71,159,135,130,140,95,104,248,37,126,165,225,215,120,85,198,101,13,191,193,111,101,252,78,195,21,252,94,195,31,68,48,31,192,31,153,251,140,224,138,157, +207,185,70,74,198,159,52,188,134,215,37,172,41,195,61,89,38,174,132,200,114,22,218,23,117,167,189,74,177,95,68,67,53,169,95,198,159,53,252,5,111,200,248,171,134,191,225,77,13,127,199,235,26,254,33,18,238,193,220,127,172,4,186,86,154,149,192,108,42,78, +23,42,18,217,114,250,77,15,116,149,163,26,177,238,193,190,177,211,25,232,116,218,163,157,206,144,247,219,85,53,228,13,171,80,112,114,246,40,233,44,227,45,13,111,227,42,21,175,3,48,97,169,179,26,171,44,111,186,30,59,182,47,167,206,243,91,149,186,170,104, +138,12,98,58,210,134,91,226,209,9,9,91,163,117,42,99,189,107,212,81,183,222,86,34,240,10,85,91,249,58,175,248,172,168,142,225,238,53,230,244,124,150,23,117,99,85,193,171,217,231,217,208,170,249,199,123,37,194,213,109,238,41,206,155,151,111,121,165,200, +5,23,238,75,101,108,199,43,173,135,150,13,148,74,164,132,128,107,177,182,84,41,86,106,92,75,244,218,90,27,137,214,175,89,149,208,74,250,188,201,76,162,89,41,90,18,54,172,112,81,83,208,218,234,175,176,152,49,55,83,198,253,121,22,242,10,46,219,234,224, +82,255,27,214,200,4,85,85,71,9,235,170,50,84,91,54,215,212,17,179,22,219,94,29,15,68,15,143,116,197,106,40,115,96,190,184,180,58,153,183,5,2,203,243,218,74,91,148,210,252,234,140,19,171,92,206,234,234,189,159,209,214,9,163,74,76,255,57,49,163,86,61,70, +10,96,254,231,231,158,12,16,83,147,46,111,169,86,30,157,215,237,184,72,172,153,52,106,72,61,236,237,22,31,117,70,179,182,30,220,12,103,209,206,184,228,155,204,180,196,98,34,128,6,190,110,40,79,102,45,199,168,189,89,94,144,140,98,206,178,23,116,30,97, +119,157,35,28,30,95,89,24,234,221,51,220,200,247,227,118,190,221,222,137,0,54,96,55,6,57,30,226,187,208,135,91,57,191,173,106,190,7,97,241,125,225,56,44,62,49,94,63,234,245,1,238,217,139,125,108,199,56,115,185,215,207,126,125,247,18,164,238,158,179,240, +117,247,158,69,67,119,223,89,248,41,10,156,241,172,221,193,118,3,130,108,55,113,247,102,132,176,5,141,104,199,26,70,180,14,29,184,147,43,221,69,59,136,225,46,239,173,186,222,243,47,121,35,17,129,207,27,137,24,26,56,230,199,174,20,193,24,231,98,215,218, +112,240,28,228,203,104,188,0,37,33,45,33,116,14,106,197,123,35,119,1,157,124,114,111,165,215,168,231,81,43,234,149,60,74,184,7,19,220,45,108,78,115,183,216,223,212,91,192,170,2,180,131,221,61,189,75,88,189,210,92,15,205,245,114,220,231,153,107,47,170, +148,15,208,132,73,236,247,92,52,225,189,152,162,102,156,99,63,37,7,56,158,94,118,38,253,139,41,93,205,149,171,210,132,52,24,232,41,160,113,48,120,1,77,137,11,104,78,208,107,203,18,194,19,145,96,1,107,6,69,70,215,14,202,17,127,184,53,34,23,208,22,241, +23,176,110,48,208,178,173,249,162,50,168,132,118,169,145,64,68,41,96,125,98,103,200,247,36,38,207,33,82,192,134,39,208,250,60,54,134,111,40,96,211,5,108,78,132,183,44,161,253,82,155,218,26,122,88,223,165,182,169,107,113,227,66,232,241,83,104,237,126, +17,190,240,77,5,220,124,208,19,26,187,212,190,136,210,208,26,42,160,243,244,127,158,246,86,183,22,176,45,18,184,12,37,18,40,32,218,119,25,221,125,5,116,157,198,77,131,90,253,117,89,172,71,180,75,103,120,212,0,78,242,133,0,254,93,244,250,98,34,31,32,27, +196,127,76,62,50,51,128,119,97,21,118,98,35,118,145,19,239,38,74,187,185,50,200,209,16,185,112,27,145,223,195,132,222,142,4,121,161,147,19,247,145,13,14,185,248,32,217,248,8,83,249,40,97,56,73,102,60,69,110,60,67,52,159,37,0,47,80,227,60,101,175,82,118, +133,178,215,40,123,131,178,183,9,134,0,45,71,143,171,240,24,102,112,144,252,140,146,207,247,210,143,76,47,239,167,159,67,4,120,156,187,15,51,138,16,229,135,240,62,202,85,1,86,25,230,171,101,152,175,150,96,246,225,45,62,67,142,144,14,29,120,9,31,100,172, +126,158,237,77,204,34,201,190,154,4,124,224,148,88,44,72,160,176,215,153,72,255,120,184,155,84,190,39,220,195,118,34,220,203,118,208,31,238,19,93,32,220,47,186,96,120,64,116,114,248,150,102,229,101,108,79,52,80,171,33,158,240,247,196,19,129,72,32,158, +8,70,130,241,132,28,145,227,9,165,55,158,104,14,246,177,33,109,226,231,240,142,231,202,169,239,240,28,206,208,241,189,76,65,2,45,60,222,122,30,117,11,15,185,149,199,236,227,33,68,138,166,138,129,149,14,28,224,234,28,83,193,79,61,117,211,222,197,108,97, +2,230,189,139,41,174,111,134,35,63,173,140,224,40,255,2,180,53,68,168,70,152,222,62,22,158,172,151,94,31,22,188,56,76,66,45,74,139,143,208,239,0,154,21,250,218,65,192,213,255,2,80,75,3,4,10,0,0,8,8,0,22,178,149,71,192,25,62,198,80,0,0,0,78,0,0,0,35,0, +0,0,103,114,97,100,108,101,45,119,114,97,112,112,101,114,45,99,108,97,115,115,112,97,116,104,46,112,114,111,112,101,114,116,105,101,115,83,206,205,79,41,205,73,85,72,73,77,203,204,203,44,201,204,207,227,82,246,205,207,83,112,73,77,86,48,50,84,48,50,178, +50,52,179,50,49,81,112,118,13,81,48,50,48,52,229,42,40,202,207,74,77,46,41,182,77,47,74,76,201,73,213,77,206,201,228,42,42,205,43,201,204,77,181,229,2,0,80,75,3,4,10,0,0,8,8,0,10,178,149,71,36,217,150,101,206,0,0,0,28,1,0,0,24,0,0,0,98,117,105,108,100, +45,114,101,99,101,105,112,116,46,112,114,111,112,101,114,116,105,101,115,53,143,189,110,195,48,12,132,119,190,74,17,65,148,127,51,104,201,86,160,200,210,162,107,65,75,180,163,192,146,12,73,54,250,248,181,155,132,219,125,228,241,200,97,117,179,189,174, +126,224,164,67,12,12,195,1,190,156,231,92,200,47,90,73,108,80,41,84,136,141,172,223,228,94,96,162,247,174,188,91,173,186,118,176,198,178,237,42,57,54,21,81,111,16,135,186,59,159,251,150,104,164,166,103,84,53,181,112,139,185,4,242,172,45,111,40,166,68, +118,102,17,211,4,46,127,6,90,242,45,22,61,210,156,25,238,180,209,55,167,236,98,208,40,58,33,127,164,130,152,175,135,249,195,133,245,119,23,175,126,37,176,18,242,212,170,211,196,129,147,51,176,164,120,103,83,244,35,1,146,121,126,6,107,230,244,127,64,49, +180,15,23,132,237,177,228,66,153,181,18,40,95,224,233,56,208,31,80,75,3,4,10,0,0,8,8,0,10,178,149,71,0,0,0,0,2,0,0,0,0,0,0,0,15,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,3,0,80,75,3,4,10,0,0,8,8,0,10,178,149,71,144,200,244,150,60,2, +0,0,83,5,0,0,49,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,65,98,115,116,114,97,99,116,67,111,109,109,97,110,100,76,105,110,101,67,111,110,118,101,114,116,101,114,46,99,108,97,115,115,149,84,93,111,18,65,20,61,3,11,139,43,182,136,109, +173,223,208,15,229,163,116,219,62,153,66,72,8,209,104,66,170,17,210,196,199,101,25,215,109,96,151,12,67,163,127,194,223,162,47,52,209,196,31,224,143,50,222,89,144,80,150,180,244,97,231,222,57,123,239,185,115,230,222,221,63,127,127,254,6,112,136,35,3, +9,236,232,216,53,16,193,142,1,29,207,149,247,66,121,57,29,121,29,5,29,69,134,120,197,245,92,89,101,136,230,242,167,12,90,221,239,112,134,213,134,235,241,147,97,175,205,69,203,106,119,9,73,55,124,219,234,158,90,194,85,251,9,168,201,207,238,128,161,212, +240,133,99,58,194,234,116,185,105,119,93,179,214,30,72,97,217,178,238,247,122,150,215,81,100,117,223,59,231,66,114,81,102,216,184,204,245,181,255,159,239,232,38,68,149,86,171,92,37,54,221,30,35,12,199,185,198,153,117,110,153,93,203,115,204,183,20,162, +88,203,51,216,187,246,25,183,101,57,31,134,72,139,37,28,210,178,182,136,130,174,73,210,107,46,213,61,44,200,141,247,45,49,224,130,97,107,94,192,204,193,223,7,49,20,189,232,148,149,25,172,41,133,235,57,129,182,40,105,100,48,94,125,177,121,95,186,190,55, +208,177,199,112,171,233,58,158,37,135,130,174,236,96,105,54,162,202,7,116,31,42,173,227,176,138,106,24,186,66,76,168,11,70,211,31,10,155,191,118,85,31,179,87,245,109,95,213,73,194,192,109,134,204,117,215,149,68,9,251,73,152,56,72,226,30,14,25,138,55, +152,16,134,212,188,38,134,237,37,68,133,203,204,68,213,132,51,236,113,79,78,155,66,13,161,17,252,228,58,65,67,118,115,215,207,128,250,210,98,193,204,48,188,92,56,180,249,121,146,32,179,51,67,69,119,254,38,84,42,28,181,212,244,107,89,250,43,36,64,66,232, +223,17,33,75,205,161,53,73,187,26,89,70,54,86,184,0,251,65,78,20,119,104,141,7,96,26,43,180,38,199,1,88,69,138,236,221,75,72,154,44,163,206,173,81,158,162,251,70,86,35,187,249,11,145,143,23,136,158,20,74,35,104,133,82,113,132,216,222,8,241,239,211,10, +43,100,65,121,9,172,211,126,35,168,84,24,231,78,42,41,111,157,222,176,192,187,79,79,132,162,83,120,128,135,148,171,206,145,9,56,54,39,231,24,199,63,154,198,63,166,248,39,228,107,132,60,197,179,64,122,134,158,177,151,197,86,96,183,255,1,80,75,3,4,10,0, +0,8,8,0,10,178,149,71,50,95,101,143,166,0,0,0,232,0,0,0,40,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,49,46,99,108,97,115,115,133,140,65,10,194,48,16,69,255,104,181,90, +11,118,229,186,136,107,67,207,80,20,4,69,193,19,196,118,168,45,105,2,73,245,112,46,60,128,135,18,83,92,186,112,62,243,63,31,102,222,235,253,120,2,200,16,135,8,67,68,132,232,108,110,182,224,109,173,152,176,200,77,219,74,93,238,107,205,39,105,29,219,117, +35,239,146,48,223,232,66,25,87,235,234,192,221,213,148,33,102,132,165,177,149,168,172,44,21,139,66,213,226,231,121,149,17,64,136,119,90,179,205,149,116,142,29,33,233,145,66,73,93,137,227,165,225,162,35,164,255,72,73,234,57,3,124,103,232,5,223,2,140,124, +6,24,123,159,250,141,252,13,245,45,153,124,0,80,75,3,4,10,0,0,8,8,0,10,178,149,71,82,66,9,29,168,2,0,0,247,6,0,0,60,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,77,105, +115,115,105,110,103,79,112,116,105,111,110,65,114,103,83,116,97,116,101,46,99,108,97,115,115,157,149,93,79,211,96,20,199,255,207,54,186,173,235,100,160,32,190,50,23,148,189,32,99,136,128,128,38,130,47,49,78,52,193,96,130,87,15,172,153,53,221,83,210,22, +223,47,188,241,198,27,253,32,94,72,162,35,241,194,15,224,135,50,158,167,45,115,27,75,198,150,38,237,57,79,207,249,157,215,180,127,254,254,250,13,160,132,21,21,49,228,85,196,81,136,147,52,37,213,171,42,18,152,150,103,69,41,205,68,49,27,197,53,6,197,218, +117,13,75,68,49,199,48,244,216,147,159,112,219,209,237,13,151,187,58,131,246,64,8,221,94,51,185,227,232,14,195,92,217,178,171,197,170,205,43,166,94,220,49,141,226,154,85,171,113,81,41,27,66,247,253,38,142,64,150,41,202,138,33,12,247,22,195,66,182,31, +64,110,147,33,178,102,85,40,159,65,105,184,190,87,219,214,237,167,124,219,164,147,225,178,181,195,205,77,110,27,82,15,14,35,238,11,131,210,29,121,100,56,142,33,170,62,242,182,93,13,170,90,236,158,69,71,79,42,37,85,227,111,183,117,210,108,215,127,71,81, +178,229,151,252,21,47,154,92,84,139,27,174,77,110,203,185,45,134,48,183,171,50,191,35,47,25,146,150,104,65,108,117,64,116,128,246,215,253,132,37,214,45,113,24,42,209,50,223,213,78,185,119,15,211,26,32,101,137,38,147,187,162,66,181,103,115,155,81,92,103, +0,195,243,190,134,222,221,167,228,45,70,232,205,140,188,149,24,38,142,227,194,160,110,88,123,246,142,126,207,144,139,50,122,196,102,90,246,67,195,32,82,242,54,175,65,197,9,13,11,24,211,176,136,27,26,206,225,188,134,37,140,71,65,172,249,254,246,136,97, +170,151,22,51,204,246,222,64,134,76,247,118,48,76,30,99,56,126,163,99,134,115,184,67,170,55,240,93,83,151,97,102,178,61,47,140,234,181,98,175,166,11,151,33,221,205,25,105,250,128,197,33,87,105,88,78,131,36,5,33,57,33,58,25,34,237,62,105,33,122,38,242, +236,0,161,124,225,39,194,251,164,134,200,28,100,30,38,207,119,24,96,239,161,178,15,56,73,103,163,190,57,78,145,4,79,146,88,70,215,105,140,5,208,165,0,170,228,11,117,68,190,53,120,10,228,82,127,108,226,40,13,142,130,51,56,235,113,104,75,2,206,67,138,79, +25,32,153,255,129,112,29,3,133,169,58,148,239,109,184,79,30,46,237,27,54,112,201,0,39,37,149,164,16,201,23,48,30,128,111,6,9,198,37,152,114,140,182,67,63,55,229,24,111,64,227,141,28,211,184,20,160,22,60,61,64,81,142,207,254,183,79,149,238,236,11,98,236, +171,135,211,124,67,31,151,2,77,97,34,128,220,33,203,176,223,176,3,176,253,182,100,94,55,85,216,220,176,203,94,227,165,116,5,147,94,69,89,207,51,71,53,3,25,68,104,56,37,104,17,249,19,43,97,4,242,23,86,194,69,210,51,244,68,42,246,15,80,75,3,4,10,0,0,8, +8,0,10,178,149,71,188,172,77,50,145,2,0,0,131,5,0,0,61,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,79,112,116,105,111,110,83,116,114,105,110,103,67,111,109,112,97,114, +97,116,111,114,46,99,108,97,115,115,157,84,207,79,19,65,20,254,102,186,101,97,109,161,242,163,96,181,130,90,161,80,100,41,32,72,74,136,164,137,9,177,17,19,12,137,222,166,237,166,12,89,118,201,238,150,248,175,192,201,155,7,123,241,2,137,38,198,179,127, +148,241,205,118,173,66,107,106,56,116,222,155,247,190,121,239,219,111,222,244,199,207,47,223,0,20,241,204,192,16,230,13,24,106,209,177,160,99,209,128,134,37,181,152,58,150,85,154,108,81,199,138,142,85,134,129,45,233,200,96,155,33,150,159,63,96,208,202, +110,221,98,24,169,72,199,122,213,60,174,90,222,27,81,181,41,50,90,113,107,194,62,16,158,84,251,40,168,5,135,210,103,72,239,157,4,210,117,246,3,79,58,141,178,123,124,34,60,17,184,30,67,98,215,113,44,175,108,11,223,183,8,183,89,113,189,134,217,240,68,221, +182,204,154,45,77,194,30,11,167,174,154,189,22,158,111,121,185,222,149,74,12,122,45,220,81,211,185,124,229,72,156,10,211,22,78,195,108,35,75,221,145,249,93,58,227,134,213,138,138,125,23,160,147,94,33,17,252,67,215,11,8,199,222,253,222,172,92,107,180, +87,61,178,106,65,169,59,162,26,241,247,203,87,123,68,57,149,33,165,215,24,16,150,235,251,249,197,146,186,132,220,255,0,25,134,246,101,195,17,65,83,137,178,245,47,170,205,64,218,230,31,37,183,186,133,216,166,82,198,190,219,244,106,214,11,169,110,53,221, +213,110,73,29,74,32,129,100,2,79,177,174,99,131,225,121,95,142,101,225,91,187,142,111,57,190,12,228,169,213,61,30,211,125,16,170,227,163,4,38,144,102,72,93,231,205,176,113,195,105,186,82,172,45,22,195,120,47,181,24,30,246,191,9,154,24,219,114,26,193, +97,248,134,104,26,102,250,157,193,50,61,66,131,70,226,22,61,89,13,92,9,75,187,97,218,153,100,105,90,16,95,184,4,255,76,14,199,8,173,3,42,200,83,72,145,159,104,3,112,27,227,80,115,69,242,68,135,63,33,70,113,96,167,112,129,152,246,1,186,246,17,90,108,123, +241,239,221,186,150,61,131,49,161,157,35,206,91,217,115,229,158,33,174,181,190,66,123,203,46,17,47,16,122,160,213,105,124,159,254,67,192,71,49,204,199,144,229,227,152,229,19,200,243,73,20,249,20,86,121,38,36,180,214,110,26,17,82,222,36,166,66,146,59, +184,67,30,39,114,171,200,224,46,209,203,34,135,123,228,105,169,29,34,158,141,136,191,164,76,140,108,114,161,240,29,250,34,253,46,48,216,234,249,245,51,109,96,167,89,146,40,78,135,205,146,148,155,86,48,53,53,81,225,77,178,60,146,147,245,150,51,221,6,116, +10,198,169,96,142,242,49,60,14,241,179,152,11,109,30,99,100,51,20,31,66,1,163,228,61,32,139,212,32,221,96,1,79,144,249,5,80,75,3,4,10,0,0,8,8,0,10,178,149,71,232,35,13,242,71,1,0,0,75,2,0,0,49,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105, +47,67,111,109,109,97,110,100,76,105,110,101,65,114,103,117,109,101,110,116,69,120,99,101,112,116,105,111,110,46,99,108,97,115,115,149,145,205,74,3,49,20,133,79,250,51,163,181,182,90,109,43,234,194,238,180,85,7,215,149,130,136,130,48,184,176,165,251,116, +26,166,145,153,68,50,51,234,107,185,42,184,240,1,124,40,49,73,75,21,45,130,89,220,228,158,220,251,221,19,242,254,241,250,6,224,12,205,18,10,216,50,97,219,69,221,69,131,192,57,231,130,167,61,130,250,161,127,79,31,169,23,81,17,122,253,84,113,17,118,143, +134,4,133,75,57,102,4,85,159,11,118,155,197,35,166,6,116,20,105,165,230,203,128,70,67,170,184,201,231,98,33,157,240,132,224,196,151,42,244,66,69,199,17,243,130,136,123,151,50,142,169,24,27,200,133,10,179,152,137,244,234,57,96,15,41,151,162,75,224,198, +44,73,104,104,169,191,92,16,180,151,120,251,166,12,38,74,62,153,249,214,112,49,160,89,162,73,245,165,21,4,165,190,204,84,192,174,185,241,219,250,203,216,169,1,148,81,132,99,66,133,160,243,143,87,17,236,126,205,191,203,68,202,99,182,184,68,11,121,253, +11,102,229,64,204,4,29,93,157,245,116,158,211,187,211,238,76,65,94,236,253,138,142,37,171,54,117,229,14,86,245,169,49,171,210,250,154,165,56,40,99,93,51,12,171,50,103,221,232,25,121,189,187,237,206,241,20,185,159,176,61,221,180,111,97,7,179,178,5,204, +157,195,204,169,138,13,107,113,211,118,215,62,1,80,75,3,4,10,0,0,8,8,0,10,178,149,71,63,23,104,255,199,7,0,0,135,19,0,0,61,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36, +75,110,111,119,110,79,112,116,105,111,110,80,97,114,115,101,114,83,116,97,116,101,46,99,108,97,115,115,221,88,107,120,20,229,21,126,191,100,147,89,38,3,134,133,0,129,86,167,154,144,100,115,15,1,139,208,180,33,162,164,134,64,27,76,140,180,218,97,119,76, +6,55,51,219,153,217,4,236,197,74,91,237,221,94,208,54,86,123,177,8,218,122,129,74,18,66,188,212,94,176,162,245,214,162,79,255,246,121,250,60,125,250,223,159,173,61,103,102,118,179,155,221,176,137,63,251,231,155,243,157,239,220,190,115,251,206,238,197, +255,158,127,1,64,59,222,149,177,5,119,174,160,37,33,163,19,99,18,76,25,33,88,140,73,242,242,121,94,108,94,28,94,92,166,79,73,24,15,99,66,194,17,25,215,224,168,12,5,119,49,244,133,48,190,88,129,47,225,203,76,116,183,76,226,191,194,219,123,36,124,85,198, +122,124,61,140,123,101,108,195,125,50,190,129,111,242,201,183,100,124,27,223,97,194,239,134,241,61,198,220,95,129,239,227,7,188,252,80,194,143,248,248,56,31,63,32,227,24,30,148,240,99,25,117,176,194,248,9,127,39,121,121,40,140,159,242,247,97,25,143,224, +103,76,251,243,10,252,2,247,75,248,37,171,121,84,194,175,36,156,16,80,172,164,107,88,230,128,107,27,230,136,132,147,132,217,151,133,161,109,175,105,234,118,79,66,115,28,221,17,104,237,179,236,145,214,17,91,139,39,244,214,88,194,104,237,177,198,198,52, +51,222,103,152,250,126,205,118,116,187,38,155,127,135,64,185,175,65,224,234,203,176,250,60,68,93,17,155,71,22,96,241,84,196,179,24,137,165,204,113,53,87,151,112,138,184,125,19,6,24,33,208,82,220,214,44,122,54,117,92,75,164,248,150,149,125,135,181,113, +173,53,229,26,137,214,62,195,113,233,108,197,128,49,98,106,110,202,38,193,53,11,142,119,250,251,132,102,142,180,6,247,238,98,113,238,168,225,212,180,93,254,230,190,5,76,189,211,48,13,183,75,224,66,125,113,242,101,70,161,184,231,139,59,122,121,206,108, +24,20,8,245,88,113,242,214,21,76,210,159,26,59,164,219,7,180,67,9,194,68,250,172,152,150,24,212,108,131,247,1,50,196,222,18,88,119,147,105,77,152,190,85,57,209,220,94,220,128,194,172,228,91,217,50,187,237,145,212,152,110,186,2,187,234,243,195,213,176, +220,84,9,107,25,121,145,124,113,2,171,216,247,154,237,246,235,71,92,82,45,208,86,191,108,29,171,70,116,119,143,230,204,91,94,90,223,112,171,119,25,226,76,38,116,246,74,153,151,178,2,37,70,141,192,218,172,188,236,117,117,91,115,45,206,172,10,203,29,213, +237,125,65,25,42,73,47,180,233,109,94,178,229,69,62,200,16,9,143,11,64,224,223,255,15,233,89,156,186,221,75,225,146,35,109,188,180,243,210,193,203,22,94,58,121,217,202,125,96,9,98,40,96,3,86,202,142,233,55,24,156,230,235,242,104,90,56,104,10,246,160, +87,193,13,184,145,161,39,4,214,204,135,178,219,182,181,163,220,103,248,232,215,10,118,161,71,193,86,108,87,112,29,118,40,216,137,143,41,232,66,183,130,65,12,9,52,46,110,83,58,147,118,31,137,233,65,248,183,4,199,205,9,58,87,253,86,173,214,213,58,117,106, +220,210,29,213,180,92,213,213,238,212,85,205,84,211,25,223,66,253,113,62,227,247,29,58,172,199,200,178,223,224,73,54,239,41,5,79,227,25,129,157,221,166,170,143,37,221,163,25,54,117,66,115,212,164,109,141,27,113,61,174,222,97,217,106,108,17,213,45,18, +78,43,56,131,223,42,184,5,55,43,120,22,67,10,206,98,72,194,148,192,182,162,46,223,107,56,14,101,149,159,57,116,229,160,127,84,21,196,179,205,211,36,181,223,250,32,134,42,152,193,57,9,179,10,206,99,78,193,115,120,70,194,243,10,94,192,139,10,126,199,193, +232,218,155,74,184,6,213,106,70,186,163,78,232,182,190,100,249,47,225,247,18,254,160,224,143,236,131,63,225,66,142,239,253,242,81,240,50,187,253,207,120,69,193,69,188,42,176,126,33,197,174,148,145,136,235,54,245,216,3,163,186,170,224,53,252,133,151,215, +5,54,164,213,25,142,26,215,147,182,30,35,159,196,213,102,34,122,3,175,72,120,83,193,91,44,252,109,252,85,194,223,4,212,98,149,170,224,18,222,17,184,246,3,246,106,129,142,37,182,142,28,166,213,5,112,205,203,234,65,2,77,203,105,32,244,166,23,47,125,129, +186,226,189,50,104,52,212,218,105,45,167,108,24,211,168,211,111,47,240,70,29,236,91,88,117,244,108,21,120,122,170,10,189,111,44,60,161,155,35,238,168,167,171,151,94,151,220,25,134,208,90,60,190,128,59,173,134,94,157,8,61,70,221,137,132,53,145,121,143, +232,177,150,12,103,55,23,249,101,19,195,191,167,192,193,37,56,35,255,241,94,170,3,43,180,88,76,119,156,154,246,206,54,106,217,61,75,214,149,25,0,10,120,114,225,165,242,94,29,26,11,201,105,233,167,244,182,2,142,47,254,180,229,141,5,139,61,192,84,190,142, +113,23,233,220,188,52,6,50,142,98,54,24,140,180,145,250,134,252,161,118,99,38,168,233,62,149,21,220,176,17,140,16,244,104,229,48,103,141,22,145,124,44,101,197,168,230,240,220,67,6,155,222,103,109,125,67,126,82,113,200,226,241,249,225,166,138,108,185, +62,104,65,100,253,144,102,155,94,93,230,50,103,98,147,137,247,86,142,247,246,37,12,37,129,24,195,106,221,79,50,220,33,155,239,199,131,183,150,76,234,38,165,126,115,193,193,112,145,102,186,99,1,253,162,21,57,79,31,118,173,116,179,89,83,192,20,114,92,146, +119,9,30,210,200,25,55,218,86,42,57,100,112,197,174,206,241,255,128,206,222,91,153,131,32,22,91,31,179,198,51,177,175,189,156,71,210,169,55,8,149,126,146,118,210,79,222,114,68,120,164,32,40,194,83,133,247,165,193,194,251,210,108,225,125,105,238,160,249, +239,122,130,75,176,187,178,146,135,21,143,179,132,103,23,58,249,36,237,30,68,41,97,128,166,104,227,20,74,162,98,6,165,209,57,132,134,103,80,54,133,242,104,211,20,164,104,243,20,194,209,234,208,20,86,68,171,9,43,159,241,36,222,68,235,149,144,104,196,60, +1,89,60,138,42,241,24,54,138,147,184,74,156,66,173,120,28,141,226,9,244,17,77,39,202,88,62,246,98,31,224,65,108,119,137,7,177,229,165,30,196,182,135,60,136,173,47,35,235,246,227,83,25,27,37,143,190,63,58,141,138,135,176,105,14,202,112,100,101,232,121, +172,26,46,141,158,133,52,112,14,87,204,160,242,197,198,105,172,78,31,71,242,143,9,46,111,156,197,154,18,12,145,160,181,167,51,183,216,200,30,16,79,65,18,79,147,245,167,177,89,156,65,151,120,22,189,226,172,119,131,117,190,246,204,13,250,241,105,12,144, +109,2,7,112,115,96,227,16,89,79,227,54,106,73,75,120,26,85,147,168,102,125,179,88,39,48,137,149,115,88,63,204,206,221,112,58,87,245,42,190,190,96,170,243,80,197,115,158,58,197,23,20,168,19,60,37,6,74,58,60,165,160,104,248,74,158,204,200,41,103,188,120, +41,139,63,156,225,191,37,109,164,120,128,28,73,78,22,101,236,200,73,212,101,89,232,123,173,186,160,215,86,240,254,28,54,250,90,55,245,249,108,31,162,209,117,26,31,246,128,207,133,78,164,111,126,101,58,2,87,21,142,192,44,221,19,123,155,102,241,17,86,91, +69,192,213,130,102,175,107,250,27,155,167,81,115,234,253,127,249,98,106,47,160,131,160,146,115,216,60,135,58,74,199,250,72,195,52,162,44,109,26,141,145,38,31,102,66,130,166,65,188,45,254,190,117,22,109,89,10,54,164,21,180,247,243,77,136,174,227,212,251, +255,36,80,158,15,194,117,20,6,136,11,88,35,94,166,172,189,72,177,127,21,183,139,215,48,33,94,199,113,241,6,38,197,155,120,88,188,133,147,226,109,92,18,151,240,158,120,7,255,17,239,82,44,254,238,57,188,139,220,127,156,114,118,152,178,162,20,247,96,19, +110,197,65,146,253,30,5,225,51,94,134,255,131,42,197,199,145,243,131,192,116,209,24,248,89,220,6,81,9,170,71,45,8,177,77,178,36,14,98,180,177,169,185,58,84,93,54,3,113,102,65,152,31,241,180,238,241,233,50,89,169,224,16,213,183,240,160,88,80,97,10,226, +65,133,41,208,131,10,83,112,135,87,97,12,141,96,212,235,7,134,167,225,48,62,234,37,89,57,182,225,24,174,133,140,143,211,247,19,33,254,27,236,24,101,125,9,110,167,47,42,195,88,79,223,175,129,255,105,59,134,199,66,242,255,0,80,75,3,4,10,0,0,8,8,0,10,178, +149,71,28,107,22,177,205,2,0,0,219,6,0,0,55,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,79,112,116,105,111,110,67,111,109,112,97,114,97,116,111,114,46,99,108,97,115,115, +149,85,109,79,211,80,20,126,110,215,209,81,58,24,111,83,240,5,68,12,27,111,101,128,32,12,17,156,98,22,23,48,153,33,241,99,25,205,44,233,90,210,118,196,159,225,15,225,139,95,192,72,98,248,236,143,34,158,219,54,115,176,74,225,67,123,207,61,231,57,207,185, +247,188,180,127,174,126,253,6,80,192,142,140,52,230,100,244,242,87,15,230,37,44,200,16,177,40,99,9,203,18,94,74,88,145,145,226,251,20,94,73,88,227,240,117,9,69,9,27,18,94,51,116,109,24,150,225,109,50,36,114,249,125,6,177,100,31,234,12,125,21,195,210, +119,155,141,3,221,249,172,29,152,164,25,168,216,53,205,220,215,28,131,239,67,165,232,125,53,92,134,204,222,177,103,216,86,201,110,28,107,142,230,217,14,131,82,182,44,221,41,153,154,235,234,132,88,170,216,78,93,173,59,218,161,169,171,53,211,80,9,219,208, +172,67,30,230,147,230,184,186,51,121,147,163,200,32,213,252,29,5,250,144,187,133,32,240,44,198,35,242,101,226,180,125,185,192,48,17,239,208,130,47,210,93,27,6,247,26,168,28,105,39,154,106,106,86,93,173,122,142,97,213,139,129,141,32,83,185,54,227,222, +193,145,94,243,138,157,26,126,10,225,219,194,117,170,208,198,45,5,9,84,14,248,116,177,89,43,20,121,213,38,239,2,100,232,174,26,117,75,243,154,60,163,149,255,29,181,233,25,166,250,175,12,27,241,89,218,36,106,185,106,55,157,154,190,99,240,182,200,118,132, +159,231,212,10,50,232,87,240,6,91,18,182,25,86,239,216,18,65,150,219,155,43,27,109,224,252,83,18,222,42,40,225,29,117,229,205,66,49,108,197,134,44,105,174,94,182,92,221,114,13,207,56,209,59,99,143,197,32,20,140,224,61,195,120,92,214,56,110,148,161,112, +239,185,184,118,177,160,114,12,67,81,165,163,22,143,111,11,42,93,93,247,130,32,52,168,253,185,124,91,27,84,117,222,146,183,220,37,96,97,24,110,143,111,154,116,166,128,46,65,131,65,105,207,85,162,236,209,13,87,204,71,141,197,181,209,10,231,174,83,147, +47,99,129,190,111,189,52,60,125,244,117,20,33,240,150,163,221,0,237,84,90,105,174,144,156,62,135,240,131,4,1,131,244,238,226,74,118,133,33,146,149,0,128,97,60,4,159,64,42,81,232,252,157,200,146,180,174,204,156,33,113,1,241,11,59,71,242,39,186,46,33,237, +206,118,168,214,197,11,164,248,190,123,110,68,60,131,124,218,138,214,139,4,23,49,40,208,157,4,193,143,186,28,48,135,81,185,244,8,143,253,147,172,224,9,73,220,243,57,158,98,140,124,167,232,98,227,36,137,153,109,58,221,179,240,116,31,201,66,188,72,79,207, +92,162,103,150,158,51,40,167,145,87,28,15,128,173,96,105,76,16,57,243,165,73,146,132,12,248,24,133,196,107,180,10,97,206,88,116,206,178,1,160,69,152,36,194,28,217,19,200,251,248,105,204,248,235,44,30,208,58,65,121,76,83,41,178,148,217,23,180,34,147,34, +141,74,63,178,81,250,65,169,88,197,232,95,80,75,3,4,10,0,0,8,8,0,10,178,149,71,228,98,213,39,225,2,0,0,110,7,0,0,63,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,85,110, +107,110,111,119,110,79,112,116,105,111,110,80,97,114,115,101,114,83,116,97,116,101,46,99,108,97,115,115,189,85,203,82,19,65,20,61,61,201,36,97,50,64,8,16,241,133,136,40,201,16,8,225,161,34,136,34,165,165,85,20,90,133,178,96,215,36,83,227,232,100,134, +154,76,148,95,240,95,92,72,21,143,42,23,126,128,255,224,198,215,194,141,27,55,186,176,188,61,153,10,17,66,37,113,225,230,222,238,219,247,156,190,125,238,205,228,253,239,183,239,0,228,113,91,65,12,227,10,58,48,209,65,171,156,48,147,194,228,197,193,148, +130,105,204,68,113,53,138,107,12,114,217,227,158,30,197,28,67,252,17,119,203,186,187,38,2,12,234,3,219,214,221,101,139,151,203,122,153,97,98,197,113,141,156,225,242,162,165,231,10,150,153,91,118,74,37,110,23,87,76,91,175,226,70,234,224,243,12,33,238, +26,12,201,149,103,252,5,207,89,220,54,114,107,158,107,218,6,29,197,11,135,88,134,225,163,204,62,79,177,142,159,32,145,5,211,54,189,69,6,61,125,156,177,57,65,123,197,103,214,25,194,203,78,145,138,235,22,41,171,149,210,166,238,62,230,155,150,46,94,228, +20,184,181,206,93,83,236,131,96,216,123,106,146,72,3,79,236,231,182,243,210,126,184,229,153,142,253,151,156,45,148,112,18,152,158,223,101,232,222,125,94,94,114,141,74,73,183,61,82,55,157,217,160,176,99,83,134,235,173,234,219,222,146,144,123,50,157,105, +183,79,138,99,31,210,222,105,160,110,219,140,49,94,227,35,114,202,222,178,116,49,98,55,24,192,240,234,63,52,176,121,118,222,111,178,180,61,41,76,94,152,41,97,166,25,70,90,1,211,203,214,156,138,91,208,239,153,162,253,169,99,57,19,226,141,42,122,209,39, +204,188,138,110,36,84,244,32,169,66,65,151,138,97,12,70,177,160,226,38,22,163,184,197,48,247,207,211,193,48,213,20,219,0,212,211,32,150,109,71,100,250,225,54,23,138,97,52,221,106,51,134,154,13,1,67,39,47,22,239,110,123,46,95,231,86,133,246,253,141,198, +181,1,213,177,43,49,68,31,194,14,250,88,134,144,20,13,161,85,82,180,200,247,212,37,242,17,72,162,125,52,177,253,180,43,209,46,76,190,95,99,7,144,180,177,61,132,180,236,30,194,218,248,30,228,29,58,144,144,34,155,130,76,51,254,17,50,251,4,133,125,70,55, +251,130,62,246,21,167,232,76,171,18,96,0,103,0,127,37,46,100,254,74,92,41,249,43,81,76,136,162,103,113,46,184,58,75,94,100,73,225,215,181,123,34,34,194,190,249,188,106,245,52,224,101,56,143,193,0,153,11,144,178,182,143,200,155,35,224,239,117,96,185,6, +190,64,202,84,193,115,228,165,147,192,63,124,112,170,154,80,123,145,140,139,254,139,152,24,239,128,102,145,114,196,21,9,109,151,212,218,69,104,31,81,114,242,33,163,34,88,216,79,196,217,175,186,146,18,85,86,234,72,47,46,7,92,27,164,32,233,139,152,54,150, +29,63,0,219,57,82,213,7,31,63,83,205,169,85,21,195,149,64,231,24,70,3,157,99,72,251,58,139,85,198,239,140,132,49,159,45,139,78,242,195,20,137,99,22,106,88,252,99,206,226,52,85,121,137,60,18,98,108,102,113,61,172,252,1,80,75,3,4,10,0,0,8,8,0,10,178,149, +71,34,122,201,90,146,5,0,0,153,13,0,0,38,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,79,112,116,105,111,110,46,99,108,97,115,115,157,86,91,115,211,86,16,254,148,24,203,177,69,18,12,196,225,30, +32,128,99,19,220,22,2,148,164,80,8,183,64,72,128,164,73,67,160,69,177,85,71,84,145,92,89,230,210,251,189,253,11,188,244,173,229,165,15,180,83,194,164,204,116,250,196,67,103,250,39,250,67,218,126,71,86,100,217,178,75,166,147,137,206,158,213,158,221,111, +119,191,61,242,31,127,255,250,27,128,151,241,109,28,59,48,37,99,58,142,54,76,117,96,59,222,232,192,12,102,133,244,166,120,204,37,112,3,243,9,220,196,45,241,120,75,198,219,9,220,134,42,99,65,70,62,142,206,234,169,130,144,52,33,189,35,164,162,120,44,198, +160,199,112,71,40,223,141,193,16,170,37,113,214,20,15,75,70,73,198,123,18,100,171,228,232,150,89,150,208,53,126,71,189,171,230,42,142,110,228,166,52,103,88,66,199,148,94,52,85,167,98,107,18,246,214,191,29,169,110,13,213,44,230,166,28,91,55,139,195,39, +121,66,81,237,98,101,73,51,157,233,7,37,30,218,16,176,26,53,212,114,153,38,155,26,117,35,25,113,50,81,208,202,121,91,119,193,72,72,134,221,83,89,208,74,182,150,87,133,201,172,106,155,212,74,136,235,102,190,178,64,157,216,72,55,8,186,104,91,149,210,172, +238,44,74,56,220,8,218,178,139,185,162,173,22,12,45,151,55,244,220,168,181,180,164,154,133,113,221,212,38,221,200,110,18,209,17,221,212,157,147,18,82,233,0,140,49,71,179,213,5,67,27,30,152,145,16,25,181,10,154,40,25,79,78,84,150,22,52,123,90,188,19,192, +173,188,106,204,168,182,46,246,158,50,106,121,105,181,233,253,126,1,92,80,174,83,199,178,25,53,226,44,234,236,194,158,23,99,172,175,161,143,75,66,79,125,112,182,192,3,208,44,143,22,29,204,174,217,86,212,33,94,212,156,201,85,2,109,72,15,132,40,180,175, +81,215,34,108,98,81,45,159,246,184,35,97,40,29,34,206,192,90,234,114,60,116,78,144,107,77,71,251,211,107,50,83,2,56,153,114,39,243,63,27,36,238,166,213,124,235,169,27,181,181,114,197,96,102,91,66,111,207,84,116,163,160,9,6,116,210,119,157,179,163,233, +176,175,53,161,76,18,214,105,195,176,238,5,177,182,167,7,56,30,91,253,87,87,8,72,47,25,90,192,36,190,58,97,90,65,194,102,55,183,240,196,41,212,95,168,205,216,80,184,195,107,154,178,100,186,129,44,130,79,71,211,255,195,151,75,196,41,171,98,231,181,243, +186,160,123,79,200,234,144,240,170,224,32,108,210,180,22,225,162,90,94,100,20,5,59,177,75,70,89,129,131,189,10,246,136,71,70,104,42,10,238,226,158,140,251,10,30,96,76,193,251,248,64,66,119,99,79,100,124,168,224,35,124,204,14,214,92,143,235,101,182,59, +213,162,219,10,246,97,191,130,79,240,169,130,3,66,250,12,159,139,237,23,244,49,95,107,66,223,96,31,47,181,91,10,210,24,96,225,231,107,119,29,117,95,98,84,193,87,248,90,193,55,34,118,223,139,42,85,135,124,114,225,142,150,119,92,82,204,172,226,118,95,204, +88,58,123,31,153,158,187,122,142,61,10,95,5,18,98,186,119,105,177,208,117,189,15,92,102,201,176,150,159,26,242,123,66,187,207,168,17,211,93,234,135,165,10,137,135,215,215,81,128,24,213,130,160,99,58,108,43,8,29,85,75,37,205,164,193,96,211,105,105,61, +110,81,67,51,139,130,193,172,193,152,132,237,233,209,255,178,142,57,86,85,37,34,22,10,28,33,14,115,144,173,163,150,97,16,147,160,164,11,203,214,150,172,187,26,118,243,243,187,131,223,250,40,146,130,101,96,163,184,107,163,190,77,16,205,223,247,243,159, +156,112,229,3,222,202,174,115,77,10,46,250,118,89,126,198,37,18,121,144,242,33,106,126,71,59,34,92,47,101,158,66,202,60,67,219,220,83,180,63,65,36,243,51,214,61,65,180,166,145,179,43,136,73,184,114,112,5,29,18,30,98,27,133,184,196,243,137,137,204,47, +136,12,174,64,105,195,236,163,127,254,250,137,222,218,145,227,115,15,98,124,238,164,255,20,186,208,139,30,230,178,155,88,134,137,229,60,165,49,90,188,68,139,12,45,134,145,224,239,153,253,60,153,230,155,87,112,152,248,136,10,71,48,4,184,210,78,28,37,242, +99,148,21,174,85,205,113,63,175,87,41,157,160,151,106,86,57,238,132,205,58,1,237,177,107,144,115,139,40,148,251,220,160,85,39,235,188,0,85,39,35,212,189,134,147,158,147,107,92,5,8,57,147,21,149,120,236,231,21,119,213,3,60,156,113,93,245,84,205,124,172, +178,215,153,26,86,161,233,247,177,158,114,195,188,206,167,8,115,140,26,97,211,145,217,136,196,106,160,182,64,160,67,60,158,11,96,238,240,2,73,56,221,212,201,250,102,78,14,187,248,154,57,57,131,81,207,201,159,94,194,218,51,116,178,233,93,227,172,94,247, +115,40,89,177,46,99,195,44,215,228,115,164,179,203,216,248,29,226,217,238,190,101,108,154,205,38,55,139,119,194,40,233,10,201,30,207,54,245,16,189,141,182,189,174,201,50,182,212,0,158,32,37,193,86,198,216,196,46,238,122,217,135,93,44,208,126,118,98,144, +25,30,97,158,175,17,230,89,254,93,198,57,92,39,121,230,112,145,191,66,47,5,202,175,121,9,197,112,139,118,231,92,2,156,199,5,47,181,83,193,94,118,135,170,51,193,94,78,182,232,165,152,42,225,236,34,249,90,117,118,194,43,118,55,115,140,114,78,190,135,28, +121,132,72,251,143,13,68,155,10,212,187,219,175,247,165,230,126,216,183,31,90,248,153,109,234,231,114,243,228,146,161,228,230,153,220,205,22,201,29,240,146,75,251,76,26,242,64,201,153,200,19,164,66,206,110,211,153,26,192,35,251,120,198,125,30,5,167,47, +217,56,125,90,147,233,3,174,52,29,93,185,241,176,222,114,116,39,220,123,100,210,115,162,121,21,73,9,39,188,184,182,242,106,18,98,102,5,219,40,214,174,168,78,174,192,18,47,31,147,213,177,2,85,74,249,216,82,222,197,91,27,103,161,201,250,227,124,149,210, +53,87,186,254,47,80,75,3,4,10,0,0,8,8,0,10,178,149,71,156,108,92,207,167,1,0,0,166,3,0,0,56,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,79,112,116,105,111,110,80,97,114, +115,101,114,83,116,97,116,101,46,99,108,97,115,115,149,82,93,75,27,65,20,61,179,89,179,118,77,77,180,154,226,119,140,41,70,41,110,20,95,36,34,104,64,20,130,10,145,60,248,54,73,134,237,200,102,86,102,39,37,255,163,191,164,79,133,62,248,3,250,163,138,119, +54,1,17,11,105,118,30,206,157,187,231,158,203,61,119,254,252,253,253,12,224,16,95,124,100,176,233,195,197,166,135,146,135,109,134,236,169,84,210,156,49,100,170,123,109,6,183,17,247,4,67,190,41,149,184,25,244,59,66,223,243,78,68,153,197,102,220,229,81, +155,107,105,239,227,164,107,190,201,132,97,225,246,201,200,88,221,113,157,8,221,50,220,208,175,220,181,82,66,55,34,158,36,130,40,199,205,88,135,65,168,121,47,18,65,55,146,65,35,238,247,185,234,217,62,163,186,202,59,145,58,195,124,172,40,212,230,70,12, +205,185,14,61,148,25,230,222,244,169,85,247,38,75,191,21,245,99,69,90,131,190,80,134,225,162,218,124,228,223,121,16,113,21,6,45,163,165,10,235,83,43,206,135,194,92,241,228,85,149,204,124,72,27,81,229,83,36,140,240,176,195,0,134,221,234,100,237,195,186, +221,132,51,172,49,84,254,135,77,141,90,241,64,119,197,165,180,75,41,190,227,28,216,9,115,152,65,214,67,133,225,104,250,85,48,20,94,93,186,237,60,138,46,13,249,117,26,151,24,202,147,71,97,40,77,34,185,37,122,194,46,236,151,133,99,103,34,87,61,186,5,132, +100,49,102,246,127,193,249,73,129,131,217,148,100,125,255,129,15,20,231,70,4,248,248,8,184,180,54,44,164,184,136,79,41,46,97,57,197,162,205,23,44,115,101,44,126,66,232,140,197,217,191,197,139,35,194,72,60,141,86,177,150,150,173,167,252,13,106,15,202, +101,232,108,97,206,245,145,39,44,16,126,38,68,97,246,5,80,75,3,4,10,0,0,8,8,0,10,178,149,71,91,120,110,152,148,7,0,0,199,17,0,0,38,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,80,97,114,115,101,100,67,111,109,109,97,110,100,76,105,110, +101,46,99,108,97,115,115,149,87,217,127,27,87,21,254,70,219,200,210,68,177,85,199,142,221,38,85,211,56,150,101,57,134,36,208,120,169,139,227,38,77,28,219,41,113,73,112,90,10,19,107,34,79,144,103,148,209,200,137,91,74,75,161,208,133,165,165,5,154,150, +125,51,139,129,164,52,9,38,63,150,55,248,241,206,27,111,188,240,87,16,190,59,51,26,75,214,184,49,47,51,231,222,57,247,59,231,124,103,185,210,63,254,251,199,63,3,248,48,222,79,160,19,134,12,51,129,16,140,22,228,81,150,113,41,129,168,187,176,196,163,34, +195,78,160,197,221,169,38,177,132,203,73,92,193,178,120,60,35,227,89,25,159,75,160,21,70,2,219,241,92,18,159,199,101,25,207,39,241,2,190,16,199,139,50,190,152,224,177,47,37,208,142,151,100,124,57,129,110,24,113,124,69,188,95,142,227,21,241,126,85,104, +188,38,78,126,53,137,175,225,178,88,126,93,0,124,67,198,235,113,188,145,64,15,190,153,196,155,120,75,232,124,75,60,190,45,30,111,201,248,142,132,237,102,217,214,77,163,114,100,121,214,182,116,163,200,157,169,139,234,146,58,88,181,245,210,224,180,90,30, +145,208,50,171,23,13,213,174,90,154,132,147,141,95,71,221,101,73,53,138,131,46,192,200,148,105,21,7,139,150,90,40,105,131,243,37,125,240,113,213,170,104,133,9,115,113,81,53,10,83,186,161,157,114,44,142,140,17,57,85,182,180,138,102,216,238,86,165,209, +248,172,102,83,229,193,198,157,0,131,14,144,165,45,154,75,90,193,7,74,105,87,108,75,29,183,138,213,69,226,115,163,181,14,103,74,175,8,232,189,27,182,54,193,142,141,234,134,110,143,73,232,204,214,41,156,176,53,75,61,95,210,70,250,206,72,136,76,152,5,77, +120,207,240,102,170,139,231,53,235,9,241,77,66,122,202,156,87,75,103,84,75,23,107,111,179,197,229,156,38,132,66,147,77,9,33,125,175,132,246,58,239,28,99,182,105,241,155,82,118,248,116,3,149,144,221,42,221,140,195,244,206,236,217,120,38,72,59,98,47,232, +149,0,221,38,124,234,202,102,141,246,246,32,134,36,116,52,210,176,92,174,81,113,56,64,127,244,238,238,137,180,140,4,101,99,75,103,69,198,226,182,89,43,248,246,108,95,80,18,148,75,85,211,214,198,141,194,164,169,11,162,131,147,31,116,50,86,241,144,101, +87,168,8,238,171,118,185,106,75,232,106,58,112,164,170,151,10,154,72,173,172,87,142,233,86,133,90,210,57,145,217,160,240,2,43,116,116,203,186,129,254,182,44,168,149,90,61,237,200,54,107,244,209,155,214,5,213,171,185,211,110,167,145,32,30,27,55,150,107, +39,187,178,117,5,59,97,150,74,218,188,195,183,56,189,189,100,22,167,180,37,173,228,247,103,71,176,178,132,92,224,135,77,2,31,8,182,25,28,250,185,13,68,213,162,219,122,7,181,21,53,251,232,134,185,146,174,85,79,253,100,217,215,180,185,73,0,219,212,66,193, +65,60,163,150,170,218,38,244,179,92,163,75,238,247,22,234,215,8,127,58,64,247,238,229,255,127,132,171,184,67,181,102,175,167,105,214,4,160,211,215,196,172,89,181,230,181,99,186,104,240,142,38,248,253,194,105,5,135,241,54,9,93,39,233,184,90,89,224,133, +162,96,0,251,155,62,112,240,43,188,111,15,40,56,132,3,18,238,89,255,58,110,89,234,178,32,88,193,71,240,81,25,87,21,188,131,119,101,124,87,193,247,240,125,5,63,192,15,37,100,238,230,55,51,182,53,86,20,252,8,63,150,241,19,54,196,70,238,101,252,84,193,207, +240,115,9,7,189,113,56,156,233,169,228,51,141,23,145,187,215,120,91,137,189,6,192,83,231,47,178,144,21,204,224,148,130,21,252,130,87,207,38,83,131,119,69,62,163,224,151,248,21,135,70,175,130,41,76,43,152,0,249,253,53,86,101,252,70,193,39,49,167,224,183, +248,29,71,121,221,140,96,167,20,213,82,205,171,163,87,230,53,143,135,157,174,79,153,222,158,74,111,198,48,237,76,65,187,192,232,11,251,69,198,46,200,184,166,224,58,86,21,188,135,167,20,252,30,171,205,228,54,49,39,33,156,21,117,145,110,158,81,156,195, +186,119,181,177,84,26,154,166,238,202,75,55,239,114,88,114,250,204,144,91,7,157,173,29,49,156,69,227,48,119,137,36,68,130,157,235,207,158,182,6,67,238,207,140,109,13,27,13,107,86,37,141,56,211,251,112,182,25,188,121,39,208,131,216,5,211,90,84,137,49, +20,208,182,79,126,48,200,250,205,162,150,203,154,81,88,31,124,141,131,108,243,171,37,62,111,26,182,170,139,232,119,4,196,32,8,108,15,154,164,12,188,40,232,216,23,116,40,40,204,84,227,216,227,121,78,44,225,120,161,48,94,42,81,112,75,31,15,240,87,106,39, +127,68,71,144,22,29,15,9,131,92,133,240,33,174,217,232,254,250,32,215,135,54,172,217,232,254,250,33,36,249,62,140,33,202,195,128,52,128,48,100,238,188,146,187,5,41,119,27,161,185,91,8,223,64,132,98,148,98,236,6,228,117,49,78,177,133,98,226,6,146,253, +107,80,36,76,231,215,176,77,194,85,156,164,144,146,240,87,108,159,185,141,86,234,180,13,71,6,110,34,189,134,123,36,12,71,187,162,158,94,70,72,142,98,251,112,44,247,62,34,93,177,174,200,26,118,132,113,118,229,206,191,86,238,188,119,157,206,132,49,194, +231,1,40,124,118,51,228,29,252,173,223,65,169,147,63,205,119,50,228,123,49,137,251,48,139,93,176,177,27,47,226,126,188,132,12,94,38,73,163,60,113,156,1,217,72,225,97,140,33,134,167,209,139,71,240,49,254,199,152,37,226,56,142,16,111,146,248,19,120,148, +118,30,194,199,157,175,33,65,1,142,226,24,224,72,143,17,69,194,9,202,10,223,238,206,164,79,226,73,74,156,28,124,146,66,124,130,86,132,78,127,186,35,246,39,116,206,133,115,140,75,190,133,157,179,115,17,33,38,29,49,42,196,184,16,255,128,174,107,14,140, +8,210,61,218,227,56,238,154,234,247,220,8,137,113,230,102,9,255,225,59,198,247,233,219,232,38,183,247,78,71,198,92,254,135,35,130,61,135,217,67,66,242,152,141,238,122,7,137,124,250,190,155,216,117,54,159,222,237,188,186,162,117,171,240,216,202,157,191, +231,111,226,254,107,62,221,251,157,202,232,67,28,57,36,232,69,150,21,151,103,173,29,100,208,195,36,125,156,117,118,156,20,78,114,103,154,53,38,60,22,4,103,177,7,143,83,138,178,210,70,28,50,35,194,83,159,204,211,164,88,144,25,231,201,211,76,66,136,232, +199,241,4,105,11,215,17,44,180,206,248,4,159,165,196,65,236,17,124,130,59,34,65,109,185,254,155,200,156,21,236,50,250,7,66,88,245,105,76,56,10,194,157,71,28,199,58,220,3,190,19,109,204,247,24,225,36,156,251,0,216,120,48,236,36,97,79,222,5,246,73,60,229, +229,234,77,190,5,3,125,4,219,83,215,33,221,181,14,105,159,201,177,51,30,188,138,104,100,117,229,206,191,195,171,126,10,58,72,162,168,167,110,82,177,135,36,236,165,175,189,244,88,152,206,17,180,155,14,9,131,162,101,51,126,221,246,249,238,244,225,83,172, +247,250,186,21,59,159,246,105,253,12,37,94,118,94,252,21,162,132,133,142,104,67,58,187,55,68,231,90,167,243,127,195,206,219,232,153,75,239,139,56,213,220,47,10,246,22,122,255,146,95,175,218,180,19,97,129,77,166,81,190,64,39,23,28,39,51,46,96,157,67,46, +63,41,182,172,104,189,16,229,243,152,247,152,26,116,152,3,162,162,73,54,182,68,169,174,37,162,30,160,27,69,129,79,141,70,221,40,30,245,178,168,8,16,70,145,101,245,92,223,144,192,50,75,251,82,93,2,21,223,65,5,69,199,65,48,0,221,67,52,188,4,238,110,224, +101,70,148,93,222,153,104,125,52,49,176,238,111,202,9,90,76,156,42,167,210,146,159,45,34,248,118,118,59,211,72,114,164,9,199,231,20,90,29,74,196,217,139,248,172,103,251,13,207,246,80,127,109,118,250,245,147,173,171,31,186,50,176,134,92,136,219,41,81, +183,92,244,135,196,4,253,231,122,232,110,49,61,195,33,249,44,221,121,142,183,192,243,156,251,47,248,238,237,226,40,125,216,41,166,4,123,191,86,76,67,190,203,67,142,163,34,67,37,7,115,241,127,80,75,3,4,10,0,0,8,8,0,10,178,149,71,139,65,53,108,124,1,0, +0,11,3,0,0,58,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,80,114,111,106,101,99,116,80,114,111,112,101,114,116,105,101,115,67,111,109,109,97,110,100,76,105,110,101,67,111,110,118,101,114,116,101,114,46,99,108,97,115,115,157,146,75,79, +194,64,20,133,207,5,4,68,124,63,80,195,162,236,192,4,26,19,117,227,35,81,140,43,162,36,24,247,67,59,150,49,109,135,12,3,9,255,74,87,38,46,252,1,254,40,227,20,170,49,216,68,227,44,238,233,156,57,223,244,118,166,111,239,47,175,0,246,177,91,64,22,27,121, +108,230,177,149,71,41,135,237,28,118,8,217,19,17,10,125,70,72,87,107,119,132,76,83,186,156,176,220,18,33,191,30,6,93,174,110,89,215,55,206,90,75,58,204,191,99,74,68,243,216,204,232,158,24,16,142,90,82,121,182,167,152,235,115,219,241,133,221,86,242,129, +59,218,72,159,43,45,248,160,41,131,128,133,110,180,107,83,134,35,99,114,117,76,88,245,248,103,104,124,211,215,66,134,132,141,106,173,245,192,70,204,246,89,232,217,29,173,68,232,153,232,206,143,232,37,215,76,248,220,37,148,19,214,6,142,18,241,142,133, +142,28,42,135,95,137,168,229,189,63,245,214,136,58,40,34,135,60,129,218,132,98,127,74,213,141,246,9,23,29,174,173,216,138,116,242,102,235,94,42,75,247,184,213,29,10,223,181,166,13,88,85,222,240,26,86,189,29,140,163,220,105,48,30,49,127,200,107,13,194, +193,127,14,141,112,56,131,157,119,7,90,177,223,56,84,48,103,238,63,26,25,80,244,97,166,206,155,153,109,148,140,206,237,61,131,158,204,67,10,5,83,179,19,115,29,11,166,22,167,1,163,139,19,124,9,203,49,92,143,225,244,90,234,113,6,45,125,67,211,95,232,74, +2,154,158,69,203,137,232,106,2,154,153,69,43,9,168,249,119,39,169,245,15,80,75,3,4,10,0,0,8,8,0,10,178,149,71,50,108,87,182,74,2,0,0,4,5,0,0,70,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97, +114,115,101,114,36,67,97,115,101,73,110,115,101,110,115,105,116,105,118,101,83,116,114,105,110,103,67,111,109,112,97,114,97,116,111,114,46,99,108,97,115,115,165,83,93,111,18,65,20,61,51,124,44,224,98,145,182,248,89,197,138,150,47,187,165,250,98,32,141, +74,98,66,36,106,66,211,247,1,6,156,102,217,109,118,151,198,191,226,127,224,197,151,154,248,96,124,246,71,25,239,44,27,76,11,6,19,67,152,123,231,206,185,231,206,61,119,246,231,175,111,223,1,52,240,60,3,3,79,50,72,233,37,129,61,189,148,13,84,116,184,106, +160,110,224,169,129,125,134,100,75,57,42,56,98,136,149,43,39,12,241,182,59,148,12,27,93,229,200,119,211,73,95,122,199,162,111,83,36,223,117,7,194,62,17,158,210,251,40,24,15,62,42,159,225,65,91,248,178,227,248,210,241,85,160,206,101,47,240,148,51,110, +187,147,51,225,137,192,245,24,204,142,227,72,175,109,11,223,151,148,240,186,235,122,99,107,236,137,161,45,173,129,173,44,194,78,132,51,212,85,63,8,207,151,94,105,13,101,147,193,24,132,59,186,198,94,185,123,42,206,133,101,11,103,108,205,145,205,229,72, +165,67,57,238,89,160,92,167,161,251,89,2,44,142,15,169,179,161,26,141,24,88,231,10,251,251,254,169,28,4,205,229,136,102,231,159,14,46,19,71,103,250,164,97,192,98,64,72,183,182,249,70,83,207,162,244,47,64,134,116,79,141,29,17,76,181,18,173,191,93,117, +26,40,219,250,35,95,107,185,251,35,162,202,244,220,169,55,144,111,148,30,110,97,169,220,190,78,50,145,193,53,19,7,104,152,56,4,41,153,187,74,101,98,19,91,6,158,49,188,252,223,49,95,98,159,55,196,176,181,170,35,134,221,245,106,49,108,70,143,230,216,237, +140,29,215,147,186,62,195,246,138,7,164,7,154,94,160,25,138,235,232,73,18,131,62,55,202,162,15,48,14,174,117,162,157,73,59,139,44,13,31,137,234,87,240,47,228,112,100,105,77,234,32,79,226,58,249,230,28,128,13,228,161,159,9,73,24,37,143,8,29,39,155,175, +213,47,16,59,218,249,140,196,206,76,251,241,217,130,41,175,17,60,133,36,79,35,195,51,48,185,25,178,86,231,153,17,171,246,182,81,8,43,229,113,147,60,78,119,48,113,11,183,17,203,189,162,154,119,162,154,111,17,163,31,144,173,214,126,32,81,167,255,5,146, +179,149,23,47,206,129,139,18,89,220,197,189,176,68,22,59,228,241,28,72,137,98,68,252,130,44,143,148,96,171,149,40,204,1,11,194,4,17,62,164,243,24,118,67,252,35,148,66,251,24,55,194,62,56,201,94,67,142,238,126,159,44,114,169,223,80,75,3,4,10,0,0,8,8,0, +10,178,149,71,133,165,180,23,103,18,0,0,198,42,0,0,38,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,46,99,108,97,115,115,157,89,11,120,84,213,181,94,43,243,56,147,147,3,36, +145,0,131,60,34,15,201,99,146,0,66,128,240,50,68,84,148,4,48,8,134,135,120,72,78,146,129,201,76,152,153,0,81,168,162,212,42,245,81,171,162,96,125,87,169,173,86,69,73,136,81,172,173,239,98,109,171,125,221,62,108,239,237,245,222,91,219,123,111,123,219, +122,107,91,233,191,246,153,153,204,76,14,38,246,227,227,236,61,123,175,189,214,218,235,241,239,181,119,222,252,248,185,19,68,52,139,79,230,210,14,250,127,249,252,69,62,31,201,231,175,26,253,45,151,254,78,31,235,228,161,83,58,237,96,210,169,137,89,227, +28,157,116,105,93,58,25,236,214,217,195,94,153,214,52,246,105,156,155,199,58,231,233,84,192,134,78,249,60,66,227,145,58,21,241,168,60,206,231,130,60,46,228,51,228,51,90,227,34,157,14,240,24,31,143,213,105,60,143,211,216,175,211,36,30,239,227,51,229,247, +4,249,76,20,138,73,58,93,195,147,125,92,44,35,103,201,103,138,140,76,245,241,52,104,201,211,125,124,182,198,51,116,10,48,139,228,18,141,75,117,170,98,246,113,153,180,229,242,9,200,138,10,249,84,10,131,42,225,59,83,62,179,68,79,181,110,118,30,159,195, +115,228,83,160,241,92,157,22,115,181,198,243,116,90,202,243,53,94,160,113,141,78,203,120,161,78,181,188,72,136,22,107,188,68,167,243,197,10,75,117,186,80,102,22,243,185,26,215,234,116,177,48,92,198,115,124,92,39,86,57,79,102,150,251,104,167,72,57,95, +62,23,232,124,33,175,144,222,69,26,95,156,71,235,120,165,143,235,53,110,144,238,42,17,185,218,199,107,68,239,75,124,220,40,191,215,106,124,169,78,87,8,227,117,92,32,189,245,226,138,128,244,2,26,95,230,227,38,217,215,6,157,90,121,163,244,54,249,120,179, +88,231,114,157,183,240,21,58,155,188,213,199,205,162,9,252,209,162,179,197,173,62,110,147,201,118,141,131,76,196,100,172,8,135,173,104,93,200,140,197,172,24,211,152,85,157,241,96,36,220,24,143,6,195,109,117,145,142,78,51,106,198,35,81,141,183,49,77,174, +51,99,214,138,112,204,10,199,130,241,224,78,43,155,136,41,223,94,157,190,110,59,211,184,75,195,219,195,145,93,97,123,114,181,25,141,89,209,198,184,25,183,52,14,65,226,197,167,153,235,96,42,112,24,14,51,21,213,7,99,49,136,182,103,107,163,109,106,10,123, +169,109,141,91,81,123,52,166,113,132,105,180,26,57,63,24,141,197,27,187,182,66,175,14,51,220,2,6,203,172,214,72,212,202,26,215,184,51,101,128,218,93,102,212,202,144,139,60,200,203,24,192,126,141,116,107,49,157,177,106,245,218,21,171,26,182,52,212,214, +47,223,178,186,118,237,218,229,151,52,48,249,87,110,51,119,154,85,93,241,96,168,42,106,181,89,187,171,86,155,113,104,21,94,200,52,42,98,43,187,172,59,201,99,84,26,117,189,217,9,154,220,198,96,91,216,140,119,69,177,195,229,153,179,139,236,159,33,51,220, +86,101,51,88,184,50,18,109,171,106,139,154,45,33,171,170,57,20,172,74,236,109,101,48,108,217,202,46,92,2,158,5,102,40,20,217,85,31,220,109,181,36,204,197,196,27,176,3,53,158,225,47,204,20,182,88,157,81,171,217,84,190,128,20,40,15,27,218,178,131,145,42, +53,180,62,26,196,48,88,159,49,77,66,41,170,150,158,23,140,153,91,67,22,44,238,93,20,12,7,227,75,152,92,37,165,235,152,220,117,145,22,75,54,11,181,26,186,58,182,90,209,181,66,8,81,43,35,205,102,104,157,25,13,202,239,196,160,59,222,30,132,26,83,62,97,111, +182,103,68,124,73,74,175,132,74,34,47,63,123,144,201,211,41,75,152,230,149,108,28,108,197,210,108,81,138,127,75,154,64,112,200,107,30,248,9,193,14,108,0,157,203,119,55,91,201,128,196,30,230,151,164,81,173,128,38,178,195,225,137,51,148,194,9,127,49,205, +25,210,26,211,6,101,15,184,120,173,112,11,50,6,238,94,129,208,138,36,227,87,44,239,160,190,128,132,102,19,205,194,218,72,66,182,203,20,14,57,193,105,200,176,180,136,84,251,65,214,47,76,13,103,110,19,113,215,153,189,49,7,183,58,109,94,87,11,19,121,94, +57,244,214,51,55,61,38,51,170,186,59,147,145,229,228,13,135,164,146,148,89,57,108,218,97,121,115,242,64,6,2,129,18,145,20,171,13,15,228,227,180,146,65,140,156,2,94,87,140,86,33,189,91,135,27,204,78,108,220,102,52,10,119,186,67,86,24,77,65,115,54,108, +124,114,250,37,160,37,21,44,2,26,131,88,196,50,209,173,209,138,99,193,57,153,35,139,134,135,95,122,167,96,206,165,49,179,13,78,244,167,123,166,182,179,19,17,110,103,21,18,223,136,100,32,244,232,72,180,197,138,38,147,200,30,21,181,0,111,173,202,21,201, +145,252,52,181,86,6,99,162,169,107,187,213,13,216,216,105,134,186,32,212,99,133,227,81,249,189,220,110,139,50,145,121,154,26,150,85,145,174,184,4,160,163,134,200,64,156,67,29,234,56,200,100,113,126,114,24,52,35,51,148,134,114,158,16,172,129,214,213,97, +238,102,154,154,109,65,199,240,157,150,181,161,211,144,45,116,218,134,211,49,227,184,122,238,208,199,147,227,58,247,182,72,16,17,182,168,36,109,125,93,36,20,178,154,149,199,157,66,218,1,172,60,56,38,196,201,233,72,182,106,235,54,48,17,220,83,147,177, +148,43,178,101,192,21,49,43,85,200,120,183,118,181,182,138,79,198,13,18,180,76,205,136,184,86,41,31,50,207,247,1,134,139,202,100,99,75,157,119,36,147,195,220,212,167,206,232,84,42,234,102,115,179,21,139,77,155,59,115,38,211,244,146,161,65,160,20,5,64, +206,238,153,3,43,231,203,202,115,134,179,114,80,209,146,100,177,64,88,228,37,126,204,82,170,44,24,62,195,65,197,133,111,17,232,237,66,66,111,140,116,69,155,81,195,9,142,143,25,196,162,82,24,24,116,23,221,109,208,65,186,211,160,47,208,109,6,221,65,119, +50,141,79,242,94,213,21,239,236,138,195,166,150,217,97,139,208,56,110,208,15,184,203,160,195,188,19,31,122,80,62,247,0,16,7,54,120,161,25,107,199,38,113,226,59,232,40,11,119,105,188,219,224,110,190,210,160,135,233,49,166,226,161,142,131,65,236,145,198, +26,95,101,240,30,222,43,12,63,35,159,171,153,170,135,60,246,28,235,90,89,125,141,198,251,12,190,150,175,211,120,191,193,159,229,235,13,254,28,223,0,156,203,142,45,131,111,228,3,136,131,138,10,131,63,207,55,49,85,12,41,52,189,234,22,89,55,227,24,168,168, +216,120,249,226,205,229,6,223,194,7,12,190,149,191,96,240,109,252,69,131,111,231,59,0,104,37,75,99,165,9,138,197,149,101,6,223,201,7,133,232,46,131,239,230,67,0,109,53,47,211,50,75,135,196,105,121,137,177,138,205,149,101,72,203,52,56,77,86,155,203,163, +209,72,212,224,195,162,244,216,193,89,27,12,181,72,66,51,246,117,15,127,201,224,123,249,62,131,239,23,67,60,192,119,24,252,32,63,100,240,195,124,200,224,47,211,61,6,63,194,143,106,124,196,224,175,8,183,108,7,14,202,54,131,31,227,175,38,3,34,19,191,37, +126,190,157,225,224,181,81,203,130,131,153,102,13,179,128,27,184,78,137,117,191,38,159,199,13,126,130,191,158,220,103,2,212,195,219,173,150,84,112,206,27,38,243,236,75,156,193,79,242,83,25,91,169,141,70,205,110,57,50,52,126,26,129,17,40,54,232,151,244, +43,131,143,138,1,159,225,103,13,62,198,79,105,220,99,208,79,185,215,224,227,89,203,83,167,136,193,125,18,113,238,233,177,233,225,140,192,179,49,218,224,231,248,6,131,251,249,121,8,153,174,188,244,2,2,41,86,92,44,11,12,62,33,105,56,198,25,141,53,126,81, +232,191,129,34,37,173,70,3,218,182,153,33,20,187,93,29,56,172,83,133,56,106,47,123,235,197,51,166,199,102,20,7,99,197,102,8,8,208,210,93,220,130,34,32,108,181,84,138,22,47,137,153,191,105,240,183,36,27,106,234,204,112,56,18,47,54,91,90,138,35,105,107, +77,172,13,39,71,154,109,154,88,220,140,198,139,119,5,227,237,197,51,42,102,84,26,116,11,221,170,241,203,6,191,194,175,106,252,154,100,196,245,76,27,135,201,177,56,18,14,117,23,55,71,194,113,51,24,134,162,157,237,102,24,219,137,6,155,139,155,219,225,177, +102,132,88,12,241,41,178,84,179,101,70,229,39,6,172,237,124,141,95,55,248,13,81,100,66,201,166,165,123,54,117,94,85,27,2,223,189,27,83,189,138,45,155,203,74,13,126,147,17,188,83,134,140,37,92,14,206,29,146,104,200,231,131,5,67,178,56,221,75,194,112,226, +221,249,157,129,105,246,167,191,71,13,7,138,79,243,70,49,119,120,112,58,232,201,98,184,249,156,253,112,193,20,248,52,151,165,225,224,125,230,163,71,249,233,233,29,82,47,253,188,233,142,197,173,142,65,15,9,246,113,188,112,160,172,207,58,168,85,89,63,122, +208,45,127,131,186,230,103,161,22,202,61,175,25,19,236,146,10,104,227,224,186,176,116,112,153,63,34,3,186,192,64,21,252,224,52,174,164,244,116,165,163,255,52,133,171,232,52,214,249,198,143,153,237,195,40,132,134,190,74,14,125,23,158,165,164,21,14,214, +2,245,84,48,113,101,7,180,102,108,47,237,42,95,56,120,20,184,220,110,198,26,172,221,113,245,160,131,186,209,29,86,63,70,151,148,58,21,223,249,29,102,247,86,185,189,71,227,201,219,100,81,137,67,89,187,65,222,39,118,116,153,161,88,22,65,210,93,32,88,49, +200,106,255,188,77,52,156,209,205,237,226,220,220,88,215,214,88,34,162,139,74,86,56,150,226,35,36,232,211,182,176,193,97,11,255,204,237,219,241,157,102,100,66,152,24,89,189,215,204,28,198,115,64,214,179,135,22,12,183,88,187,229,93,192,141,45,173,16,31, +175,112,222,154,174,32,74,37,43,211,50,39,215,124,90,217,121,137,51,43,118,177,220,154,189,166,186,244,2,93,28,121,159,166,90,147,130,63,30,73,221,221,75,28,85,31,217,102,197,81,245,12,168,175,219,21,83,200,18,52,243,134,172,112,91,188,93,133,41,12,144, +23,9,55,68,194,73,7,230,43,202,228,54,150,139,126,174,54,169,204,206,118,138,61,167,192,78,3,11,85,210,185,112,158,35,152,218,162,145,174,206,245,65,145,91,152,14,13,242,228,33,113,55,99,232,204,79,68,104,22,178,36,207,74,53,231,133,176,218,80,232,19, +224,7,233,162,99,67,169,135,131,130,140,28,183,31,96,70,102,34,160,109,208,243,172,88,115,52,152,124,237,235,148,39,140,249,14,54,25,166,149,188,219,173,110,101,158,145,3,147,245,166,88,199,35,1,9,191,248,212,107,138,162,241,65,252,58,251,141,197,139, +174,29,62,246,43,201,192,11,65,122,8,12,1,235,233,47,41,19,156,50,123,32,216,60,173,161,174,24,180,26,237,100,77,28,164,195,140,221,196,251,192,130,79,165,107,102,80,59,162,35,92,174,171,234,50,102,135,86,90,241,159,241,119,133,20,174,69,213,237,125, +128,81,29,42,198,70,224,171,21,110,182,50,108,100,47,175,183,23,45,116,224,92,159,228,55,42,141,155,252,205,8,152,210,98,197,130,81,171,37,117,15,19,4,232,194,132,214,140,112,85,183,243,79,72,122,135,191,138,208,89,180,131,154,136,200,75,227,165,120, +70,47,71,110,239,196,244,69,213,191,29,255,113,145,87,253,131,170,45,148,123,62,81,254,56,185,43,226,247,40,208,226,218,142,239,151,240,107,49,185,209,195,104,89,63,121,154,142,146,183,151,180,94,242,61,173,24,220,139,175,142,150,104,41,141,164,115,233, +62,244,12,155,156,238,167,7,136,20,171,7,19,172,54,147,71,209,78,44,235,165,92,176,211,155,122,41,239,24,185,208,53,154,202,221,189,52,226,24,241,0,227,66,72,38,90,134,239,2,176,171,163,9,116,158,18,48,198,102,146,16,32,189,187,232,33,136,216,71,15,211, +151,49,103,107,157,163,168,114,203,202,143,211,200,30,26,245,84,138,173,87,233,183,42,141,85,110,138,85,46,61,66,143,98,254,8,250,178,237,175,224,255,195,244,24,185,132,169,235,32,244,207,3,27,119,63,229,55,245,83,65,83,217,179,228,234,163,66,166,94, +58,163,151,70,215,247,83,81,83,89,128,123,105,76,67,121,31,141,197,213,199,237,119,247,209,56,166,67,124,82,122,126,166,111,208,248,26,79,133,223,211,67,103,30,226,39,252,158,194,9,61,52,241,16,229,247,211,164,38,89,58,185,225,8,223,139,225,226,30,58, +235,16,141,7,165,223,3,226,41,61,52,181,198,235,247,246,208,52,16,236,1,193,116,69,80,233,247,228,47,238,161,179,171,189,54,101,17,40,102,8,173,230,215,252,248,229,190,66,173,45,193,162,11,176,168,84,45,58,75,209,186,61,9,82,176,245,123,188,41,186,201, +71,169,236,48,21,129,186,28,212,135,41,175,159,2,240,84,197,139,88,2,162,26,175,108,219,239,237,163,202,28,68,204,24,225,229,77,72,84,218,209,187,9,222,53,154,162,212,18,148,251,42,250,169,10,140,102,22,206,234,161,217,66,60,187,135,206,145,118,106,141, +207,239,235,161,57,135,168,208,239,75,110,23,170,208,1,25,158,219,224,169,206,45,202,21,147,85,63,68,243,177,43,252,146,125,205,168,209,51,89,234,9,150,122,138,229,220,134,253,185,124,228,212,203,71,104,41,116,201,73,87,55,49,127,132,166,15,165,151,16, +233,202,101,243,26,142,124,60,179,162,135,230,7,36,158,92,42,158,142,82,0,223,141,52,142,54,209,84,196,120,45,93,78,23,209,22,90,75,87,144,137,127,219,105,43,117,83,51,93,77,45,116,19,89,72,177,86,68,89,27,61,75,237,244,18,5,233,187,180,141,126,6,170, +247,40,68,31,82,7,157,162,48,143,160,8,143,165,78,158,72,59,184,152,162,92,74,113,158,71,93,220,72,59,121,35,237,226,109,212,205,157,116,37,239,165,171,248,0,237,225,71,105,47,63,142,223,199,104,31,63,79,215,241,171,180,159,223,166,27,248,3,186,145,127, +79,55,243,31,233,86,254,43,221,198,31,211,237,57,146,254,18,251,61,72,176,110,100,195,87,233,107,248,222,73,147,233,113,122,2,189,71,144,108,50,166,65,51,195,158,133,46,54,157,6,105,83,232,235,244,36,233,28,67,206,63,133,21,185,208,106,171,154,245,65, +110,110,162,87,74,175,211,211,160,211,160,131,189,214,135,157,253,1,214,122,18,191,107,249,57,122,6,61,15,149,243,59,176,196,49,73,245,28,119,50,15,209,123,4,250,225,214,192,191,69,110,29,71,150,78,229,95,81,31,61,7,155,247,39,49,70,81,61,159,145,173, +54,196,189,128,254,9,122,49,129,58,115,49,34,25,175,149,185,33,166,108,0,8,108,224,186,27,74,28,74,3,46,45,5,92,7,157,89,228,12,98,113,47,88,220,231,192,98,31,146,253,37,155,5,187,161,185,134,177,77,130,27,189,180,160,190,188,161,226,68,181,219,85,237, +41,242,20,185,31,66,74,22,121,102,215,120,3,201,220,170,201,193,118,23,230,208,250,253,30,196,239,47,2,125,180,136,169,161,194,6,19,26,91,145,192,146,197,130,48,129,30,90,114,228,212,251,101,3,49,57,5,214,38,32,153,15,182,153,4,187,204,68,91,13,47,172, +129,31,214,195,207,27,224,55,209,119,19,252,53,9,113,96,123,69,71,36,127,19,171,92,192,242,18,250,22,104,220,84,64,211,225,159,39,176,195,53,160,120,153,94,193,216,98,64,174,248,204,165,56,36,177,115,19,189,170,176,211,135,200,127,13,222,207,73,121,202, +30,121,67,25,241,77,250,182,109,17,215,42,240,3,154,242,91,253,180,180,169,188,151,206,5,124,214,2,86,151,53,1,5,235,122,233,188,134,138,20,190,246,209,114,152,162,159,206,135,233,46,168,113,87,40,107,212,0,195,18,246,56,41,189,132,65,188,54,155,11,133, +205,10,176,81,72,136,140,191,40,201,228,98,48,89,137,204,214,108,46,185,254,220,4,151,117,210,75,64,180,46,32,82,237,126,128,166,248,125,78,24,211,71,245,96,118,132,38,15,76,79,24,60,125,234,81,191,175,176,225,56,173,130,20,168,176,90,216,190,74,121, +138,247,97,210,10,215,96,192,237,207,245,235,125,116,137,75,232,103,34,32,228,160,104,148,61,139,118,94,9,6,165,221,36,233,37,180,211,138,60,130,79,213,199,105,109,181,7,225,33,75,46,29,188,164,51,181,100,157,88,161,143,214,171,229,74,248,153,129,194, +203,220,47,80,83,147,2,104,212,186,141,61,180,17,27,90,16,72,238,103,19,182,82,4,208,219,92,120,185,189,41,79,6,121,147,59,193,209,94,120,234,38,132,225,150,167,83,33,120,37,2,75,64,38,23,9,236,71,10,151,66,187,217,72,224,213,8,11,19,105,27,70,154,238, +66,154,74,150,221,15,173,78,32,244,254,5,1,246,115,132,209,251,8,151,223,33,132,62,66,208,124,76,39,89,167,183,0,137,223,225,124,122,155,231,208,119,249,92,250,30,215,209,247,185,141,222,225,93,244,46,223,74,63,228,87,232,199,252,58,253,132,79,130,75, +18,222,14,162,98,56,41,96,69,215,0,152,37,100,115,33,251,49,122,11,188,53,72,191,157,190,67,111,35,60,223,167,105,0,187,39,49,251,59,132,246,247,212,138,213,208,245,40,194,221,75,53,100,67,148,7,178,13,5,126,26,79,82,105,113,12,208,216,6,184,255,62,189, +139,177,53,224,168,198,36,168,147,105,129,222,15,232,135,8,249,92,126,153,126,68,63,70,18,248,249,89,250,9,52,112,209,108,190,7,218,222,70,110,236,236,5,250,169,74,51,73,154,57,104,109,61,127,150,210,243,231,0,85,91,214,47,48,102,243,120,35,197,227,61, +164,165,46,47,203,137,250,231,151,104,161,7,93,212,79,87,192,153,102,189,123,73,249,107,228,45,92,179,178,172,143,182,166,23,38,52,61,81,152,212,120,38,30,166,220,0,206,252,230,245,1,57,236,90,164,231,2,178,252,8,158,181,6,192,165,82,210,86,244,129,38, +34,115,36,164,22,208,175,1,30,255,14,160,121,31,64,243,159,40,5,255,11,149,219,111,104,57,125,160,188,177,4,218,4,80,110,253,43,253,27,246,230,71,63,1,250,56,42,127,141,117,164,122,239,195,182,2,23,203,232,63,192,35,7,220,133,207,157,233,160,175,232, +127,131,214,134,250,15,0,178,71,233,183,9,144,109,135,101,100,215,39,202,235,3,39,150,184,170,221,69,238,137,15,209,174,64,145,123,118,141,71,33,171,39,81,139,248,251,169,181,169,176,45,145,0,158,198,227,212,222,75,65,84,56,146,228,219,146,243,219,179, +231,143,82,72,44,211,209,67,225,195,9,154,72,54,205,126,55,0,251,198,126,90,220,36,165,103,47,117,214,7,20,248,164,227,247,164,138,84,42,187,149,94,238,64,18,1,222,11,12,28,47,213,52,2,223,63,209,104,250,51,32,253,67,154,79,127,129,109,62,162,203,232, +111,40,34,254,78,123,48,119,45,140,114,11,51,61,206,56,49,216,69,207,227,168,73,66,251,104,148,24,71,213,49,155,131,12,16,104,207,65,127,175,130,118,23,236,124,165,130,118,55,14,132,17,42,174,221,56,13,167,165,160,253,68,10,218,79,36,160,253,22,248,87, +114,34,39,223,135,76,249,239,196,233,88,133,86,60,35,22,118,63,158,85,103,87,167,157,139,30,250,31,97,136,197,255,75,191,119,88,236,202,46,210,157,23,255,193,81,114,206,240,36,255,31,253,209,97,49,15,67,50,236,245,167,212,173,168,90,205,16,141,63,131, +118,244,80,20,88,238,62,66,110,215,51,84,86,24,59,78,241,103,40,244,180,170,33,6,138,132,106,228,200,60,244,254,172,36,125,136,172,22,140,28,69,93,184,175,137,98,23,162,221,141,59,91,55,218,43,209,46,67,123,21,218,61,104,247,130,199,103,208,94,173,252, +184,131,246,185,117,186,22,237,117,24,159,132,118,63,218,207,162,189,30,243,69,104,63,135,246,6,180,55,186,115,232,0,218,207,131,254,38,180,55,131,110,29,208,244,29,111,238,63,0,80,75,3,4,10,0,0,8,8,0,10,178,149,71,95,15,62,210,163,2,0,0,41,7,0,0,51, +0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,65,102,116,101,114,79,112,116,105,111,110,115,46,99,108,97,115,115,173,149,109,79,211,80,20,199,255,183,27,235,232,6,27,40, +136,207,11,130,64,11,148,161,162,136,49,81,124,8,201,68,19,116,137,188,49,119,107,29,213,174,53,119,69,241,35,248,93,124,33,137,74,162,137,31,192,15,101,60,183,171,163,178,145,130,49,77,122,207,57,247,220,223,57,231,222,115,219,159,191,190,253,0,80,198, +138,6,21,211,26,178,152,233,39,73,87,49,171,33,141,121,13,38,22,84,148,85,44,50,228,234,126,179,201,61,171,226,120,54,195,120,197,23,13,179,33,184,229,218,102,221,117,204,39,92,180,108,107,117,223,103,133,33,115,203,241,156,224,54,195,228,116,178,251, +76,149,33,189,234,91,4,47,72,195,250,118,179,102,139,167,188,230,146,101,184,226,215,185,91,229,194,145,122,100,76,7,91,78,139,33,127,231,101,96,139,199,111,2,199,247,164,186,230,121,182,88,117,121,171,101,147,106,30,140,28,139,25,38,33,38,226,235,41, +235,98,147,191,175,217,27,1,23,65,219,200,48,50,93,121,197,223,114,211,229,94,195,220,8,132,227,53,86,102,54,25,82,92,52,100,114,93,147,12,3,190,23,67,168,184,194,48,212,150,219,81,105,50,160,26,54,123,144,123,196,74,46,162,139,45,247,223,143,242,207, +249,222,186,239,253,169,38,247,87,6,119,123,213,150,28,47,30,73,197,85,6,48,172,29,225,152,147,201,229,176,21,148,157,5,249,42,51,76,28,101,9,131,182,225,111,139,186,253,192,145,173,49,218,229,51,47,139,204,35,135,188,124,93,203,163,31,154,138,37,134, +229,68,250,51,239,181,231,191,243,122,156,222,216,97,83,50,198,117,21,55,242,88,198,77,134,185,99,245,32,195,236,113,182,159,97,241,248,221,65,55,56,121,87,25,166,186,78,244,176,243,42,37,249,49,124,232,213,235,255,161,97,226,173,248,175,233,118,197, +165,27,204,45,235,254,78,32,120,149,187,219,246,33,31,129,42,74,244,197,204,66,182,255,176,236,41,146,250,160,200,62,35,203,0,105,15,73,83,104,204,233,108,15,138,110,124,65,106,151,84,5,131,244,30,68,138,86,214,208,199,234,208,152,133,2,217,70,219,238, +40,226,4,16,74,18,203,232,57,137,145,8,186,68,163,244,82,82,31,59,172,12,228,37,220,138,49,148,14,67,33,203,169,144,49,134,179,17,227,17,173,160,232,40,124,71,250,185,161,127,70,74,102,216,247,233,0,176,25,2,75,109,215,14,176,16,1,165,116,142,36,133, +228,243,184,24,161,239,70,53,107,146,106,124,69,70,223,167,106,114,134,9,100,89,43,150,170,214,33,107,109,114,81,22,62,30,241,238,145,143,140,159,209,141,61,176,221,3,25,190,136,101,152,233,112,50,184,20,110,155,148,38,48,25,102,116,57,92,57,69,39,5, +232,116,78,42,12,12,145,215,105,26,207,164,229,15,208,192,5,26,75,52,162,152,165,127,160,129,57,104,191,1,80,75,3,4,10,0,0,8,8,0,10,178,149,71,71,209,102,236,146,2,0,0,156,5,0,0,51,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109, +109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,79,112,116,105,111,110,83,116,114,105,110,103,46,99,108,97,115,115,149,83,237,78,19,65,20,61,211,15,182,148,181,93,202,151,40,154,130,85,218,45,101,41,226,39,136,198,26,19,35,1,19,12,6,255,13,237, +88,150,108,119,155,221,197,232,163,248,4,254,149,68,32,209,196,7,240,161,140,119,166,43,66,219,4,248,115,231,222,59,115,238,61,231,206,204,239,63,63,126,1,168,226,217,32,174,160,148,38,99,166,145,65,89,134,115,41,84,210,152,135,165,97,33,13,13,101,105, +170,210,44,166,112,87,158,93,210,112,95,195,3,134,56,247,155,12,185,181,61,254,145,91,14,119,155,214,102,232,219,110,115,153,97,192,107,135,182,231,146,179,98,187,118,184,202,48,91,236,61,215,155,41,109,49,36,106,94,67,48,100,215,108,87,172,239,183,118, +132,255,150,239,56,66,118,242,234,220,217,226,190,45,227,40,153,8,119,237,128,65,223,80,13,59,101,40,124,229,186,194,175,57,60,8,4,237,90,107,158,223,180,154,62,111,56,194,170,59,182,85,243,90,45,238,54,100,139,55,220,15,132,95,56,141,39,1,153,166,8, +95,216,65,219,225,159,215,121,139,250,140,22,75,253,132,166,66,175,227,107,120,200,0,134,215,23,210,121,62,159,170,154,69,236,211,130,52,85,105,22,25,10,23,193,49,12,241,122,93,4,65,161,186,180,64,240,90,241,146,234,251,10,77,111,122,251,126,93,188,180, +229,208,199,123,42,204,75,136,142,97,24,58,114,24,145,230,145,142,44,12,98,94,169,104,120,172,99,25,43,12,19,221,165,159,239,219,78,67,248,58,158,96,85,199,13,76,49,176,138,142,235,152,210,240,148,161,114,41,234,12,198,255,250,27,59,123,162,30,50,204, +156,63,51,122,203,69,57,110,163,155,29,233,14,66,238,135,193,59,59,220,101,24,235,115,185,165,247,244,202,121,187,45,220,6,209,237,119,160,39,21,105,166,169,230,207,227,134,60,253,184,12,253,214,24,77,148,198,73,94,78,78,153,214,164,202,141,208,155,27, +165,104,155,162,56,173,89,243,24,113,179,124,136,132,57,119,8,118,160,160,99,10,150,160,247,57,132,4,211,49,200,168,40,203,96,156,242,249,14,12,19,184,6,40,79,182,97,202,147,141,98,228,211,109,68,109,62,168,24,88,49,191,35,145,75,30,97,224,11,166,126, +66,219,62,70,74,134,131,148,103,180,28,33,253,21,147,255,54,134,206,108,124,59,225,52,32,107,177,97,197,67,239,212,141,120,48,249,20,162,158,22,173,114,47,105,30,65,239,6,143,159,2,39,59,96,67,138,205,71,224,13,146,71,194,161,153,229,185,99,196,14,186, +224,154,130,155,157,35,39,51,208,48,29,205,64,195,140,154,129,244,110,161,128,184,145,194,109,220,233,97,70,226,186,153,105,103,152,77,171,210,49,204,42,91,196,164,186,146,24,221,238,61,92,69,26,55,105,133,145,250,11,80,75,3,4,10,0,0,8,8,0,10,178,149, +71,120,38,226,84,96,4,0,0,26,11,0,0,59,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,65,98,115,116,114,97,99,116,80,114,111,112,101,114,116,105,101,115,67,111,109,109,97,110,100,76,105,110,101,67,111,110,118,101,114,116,101,114,46,99,108, +97,115,115,173,86,91,119,26,85,20,254,14,12,76,50,153,230,130,161,53,38,173,73,12,21,2,13,173,182,105,45,52,74,211,212,96,201,69,169,137,105,43,118,128,9,153,20,102,112,102,136,68,255,131,239,174,229,123,95,235,11,109,92,75,87,159,253,29,254,14,117,159, +129,32,100,176,165,89,194,226,92,246,217,103,239,111,127,251,156,125,248,227,175,95,127,7,112,5,63,72,56,135,219,34,150,37,156,197,29,222,172,72,184,139,79,37,172,34,205,167,159,241,209,61,9,25,172,73,88,199,198,16,54,241,249,16,190,64,150,55,247,7,240, +165,4,15,182,6,176,61,132,113,124,197,39,59,188,121,32,226,33,223,255,72,196,215,34,114,12,254,164,166,107,246,18,131,55,28,217,98,16,150,141,162,202,48,146,209,116,117,189,86,201,171,230,125,37,95,38,73,32,99,20,148,242,150,98,106,124,222,18,10,246, +158,102,49,92,207,24,102,41,94,50,149,98,89,141,23,202,90,60,149,183,108,83,41,216,155,166,81,85,77,91,83,173,101,163,82,81,244,34,55,187,108,232,7,36,84,205,4,195,88,73,61,86,58,220,168,218,154,161,51,140,135,35,153,125,229,64,137,151,21,189,20,207, +218,166,166,151,72,117,194,165,122,71,181,21,173,172,22,25,166,122,172,89,5,83,107,89,28,44,24,250,174,86,170,153,4,57,20,62,9,182,3,218,166,98,90,132,139,19,225,175,58,99,134,217,215,235,147,182,209,114,245,42,237,38,50,210,22,11,77,10,24,110,187,208, +56,38,139,29,187,18,77,50,106,182,86,142,175,41,213,68,228,196,156,50,87,53,40,9,44,77,73,122,162,30,110,41,229,154,186,82,175,154,170,101,57,144,2,189,216,244,104,115,196,116,135,169,52,37,68,177,13,30,140,216,12,198,234,17,141,27,29,131,84,109,103, +153,31,156,147,232,206,118,31,156,195,234,241,225,185,214,173,154,116,195,116,75,150,184,191,149,122,65,109,34,20,241,13,101,55,171,149,116,197,118,178,251,227,27,243,217,167,219,200,41,193,174,246,13,200,217,185,145,223,87,11,118,34,226,22,81,202,234, +151,121,115,165,59,163,237,229,226,127,93,194,94,87,47,121,170,112,28,246,179,70,205,44,168,119,53,158,194,104,127,23,125,129,219,146,241,54,38,24,70,79,218,149,241,46,166,101,204,96,90,196,99,25,239,67,17,145,151,81,64,81,198,44,95,81,177,43,162,196, +87,246,68,104,50,246,241,68,68,89,70,5,186,8,67,70,21,223,202,48,193,175,192,45,25,54,106,12,144,113,128,239,100,212,113,200,155,239,25,206,116,197,43,35,130,121,58,129,167,42,91,20,246,27,48,237,214,238,208,74,153,165,90,69,213,237,246,137,102,152,126, +93,181,161,114,27,126,232,206,78,164,159,194,243,10,227,199,213,87,222,83,172,99,88,68,233,92,184,47,195,195,180,171,171,228,46,134,255,39,136,174,235,194,144,236,199,182,107,95,219,195,197,254,52,169,176,208,171,226,84,83,226,33,16,238,172,0,25,205, +226,87,110,184,91,194,48,160,181,170,40,149,189,174,13,29,213,53,224,150,82,201,37,254,214,213,186,237,60,195,15,232,97,213,157,73,247,83,216,190,234,162,166,23,213,250,198,46,67,176,23,21,105,254,36,212,104,251,141,176,123,119,159,197,102,208,170,241, +67,77,246,120,40,233,116,207,39,57,24,238,37,23,102,232,255,197,57,240,143,8,198,111,61,181,239,208,44,78,61,221,77,248,230,159,131,253,66,3,15,38,169,245,59,194,32,166,192,239,173,163,128,243,184,0,8,2,47,13,78,63,211,234,103,121,79,58,239,97,174,101, +180,74,218,94,234,47,70,125,191,193,179,227,157,111,192,155,221,17,168,19,178,13,248,214,98,13,248,215,98,52,21,27,24,216,254,215,107,0,2,181,147,4,116,138,190,231,17,34,143,28,193,116,211,90,19,129,51,10,209,143,145,222,8,85,160,48,237,102,188,120,144, +22,247,254,39,121,247,83,159,139,114,191,13,12,54,32,29,97,136,97,253,210,17,100,134,159,176,66,131,51,12,47,225,185,41,76,8,129,225,6,70,22,125,65,223,207,24,139,209,116,244,8,99,94,108,63,197,36,205,188,65,95,3,129,9,33,232,19,30,55,240,86,107,233, +239,23,177,103,228,193,235,160,190,64,148,130,216,8,17,19,11,196,194,135,196,67,138,240,237,16,178,71,132,139,71,176,68,136,22,16,165,111,140,208,133,112,21,151,104,46,96,12,247,40,5,151,157,248,114,237,248,114,244,111,243,3,135,245,28,89,187,74,241, +93,107,231,129,75,22,73,114,157,198,2,73,110,224,35,135,191,155,163,41,242,149,160,17,231,96,149,44,114,155,210,124,52,246,18,227,13,4,159,245,204,109,147,89,169,237,89,66,178,229,89,194,45,66,221,233,199,211,242,244,49,62,113,250,212,63,80,75,3,4,10, +0,0,8,8,0,10,178,149,71,147,157,188,21,188,2,0,0,32,5,0,0,44,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,80,97,114,115,101,100,67,111,109,109,97,110,100,76,105,110,101,79,112,116,105,111,110,46,99,108,97,115,115,141,83,91,79,19,65,20, +254,182,183,45,237,34,165,92,20,65,40,23,161,45,202,138,23,188,80,171,4,49,33,105,196,164,6,131,111,67,59,89,134,108,119,155,221,45,17,127,10,207,38,190,248,160,137,74,144,68,125,246,71,25,207,236,46,165,20,73,124,153,157,57,251,157,239,124,223,57,51, +191,255,124,255,1,96,17,43,41,100,80,80,81,76,33,130,66,15,250,48,159,162,229,134,138,155,73,44,164,144,128,158,198,45,44,38,113,91,126,239,168,184,43,191,247,228,178,164,226,190,138,7,10,18,123,204,108,113,87,65,166,178,203,246,152,222,242,132,169,87, +132,235,45,43,232,169,10,195,98,94,203,225,10,102,186,126,151,130,179,201,44,67,175,122,142,176,140,229,50,165,36,74,194,18,94,89,65,52,95,216,84,16,91,181,235,148,220,87,17,22,127,209,106,108,115,231,21,219,54,41,146,173,216,53,102,110,50,71,200,115, +24,140,121,59,130,148,228,43,182,99,232,134,195,234,38,215,107,166,208,95,50,199,229,245,85,187,209,96,86,93,82,109,52,61,97,91,84,46,105,112,111,83,26,80,48,152,47,156,151,68,30,78,16,68,156,61,129,116,154,156,61,23,188,192,90,154,213,235,43,142,209, +106,112,203,83,48,148,63,143,146,142,147,172,13,201,254,75,79,114,135,185,161,98,106,209,27,5,169,170,221,114,106,252,185,144,29,24,187,192,234,130,100,210,48,132,97,5,3,167,106,87,28,135,237,75,201,26,250,145,213,112,29,179,10,38,78,171,174,155,38,55, +152,89,245,152,199,215,222,214,184,207,69,136,128,52,87,183,185,155,179,108,47,183,195,246,120,142,89,251,57,255,50,44,200,66,83,42,30,106,120,4,146,60,26,194,73,121,174,209,50,61,209,52,121,128,116,9,90,194,99,186,60,221,78,53,148,241,68,195,83,41,104, +246,255,198,121,134,101,99,123,151,215,168,135,151,206,142,134,238,136,43,222,5,189,91,167,149,134,43,71,177,222,57,250,32,149,116,71,105,96,93,131,10,255,201,190,171,194,93,107,52,189,125,76,210,155,201,208,131,162,129,201,46,210,119,128,78,17,12,34, +78,123,106,57,173,151,41,82,70,148,118,64,166,120,8,165,120,140,200,214,33,162,95,17,251,236,163,175,208,42,223,33,40,35,70,57,35,180,211,2,60,174,98,212,231,31,195,181,144,171,25,114,45,21,191,33,126,128,222,99,36,182,178,234,33,146,63,139,95,16,59, +66,15,25,125,31,134,83,39,225,232,17,210,17,252,130,246,169,93,113,152,52,130,106,169,84,163,159,248,199,169,66,30,19,29,213,151,218,213,199,41,30,241,171,235,116,146,255,226,146,245,148,44,225,7,167,59,146,227,97,114,208,144,28,197,38,49,21,90,120,70, +17,105,87,147,36,243,71,232,141,224,117,119,43,230,144,38,57,35,190,80,31,27,242,201,221,52,102,124,25,116,103,67,198,82,40,43,27,244,224,146,130,3,168,177,15,100,252,99,151,198,249,14,141,217,182,193,57,31,149,255,11,80,75,3,4,10,0,0,8,8,0,10,178,149, +71,182,192,176,115,152,2,0,0,170,6,0,0,61,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,79,112,116,105,111,110,65,119,97,114,101,80,97,114,115,101,114,83,116,97,116,101, +46,99,108,97,115,115,173,85,237,78,19,81,16,61,183,93,186,237,118,177,21,161,126,224,7,98,17,186,20,10,53,200,167,10,18,49,36,13,154,212,52,193,127,183,237,90,23,183,187,230,238,214,143,71,241,9,252,227,15,77,68,141,36,62,128,15,101,156,91,150,90,210, +154,69,226,159,206,206,204,153,115,166,119,230,238,254,252,245,253,7,128,121,172,39,144,196,13,13,58,178,242,105,66,163,159,155,26,38,49,165,33,7,67,197,180,6,21,51,42,102,53,36,48,167,98,94,69,145,33,89,115,155,77,238,212,75,150,99,50,140,151,92,209, +40,52,4,175,219,102,161,102,91,133,199,92,120,102,125,243,15,102,149,33,230,63,183,188,236,92,31,116,23,174,93,40,36,122,205,114,44,255,46,195,195,169,112,120,184,124,174,194,160,108,186,117,106,54,37,3,59,173,102,213,20,79,120,213,166,200,80,201,173, +113,187,194,133,37,253,32,168,200,118,25,50,143,94,250,150,235,108,188,230,34,80,43,251,220,167,188,190,237,56,166,216,180,185,231,153,132,91,14,237,50,219,159,137,254,107,186,201,223,86,77,242,132,127,136,97,24,153,42,237,241,87,188,96,115,167,81,40, +251,194,114,26,171,185,167,12,81,46,26,178,225,158,36,141,196,117,118,92,231,136,32,121,172,217,251,253,232,194,59,62,222,166,86,118,91,162,102,110,89,242,120,50,61,232,89,169,160,35,133,180,142,179,88,208,49,136,51,58,110,99,84,197,162,142,37,44,171, +88,209,177,138,53,134,133,80,229,141,103,190,41,182,44,225,249,229,86,53,72,51,12,247,11,75,181,59,12,51,39,227,60,60,31,26,152,222,237,74,14,218,181,197,83,206,144,33,255,47,103,169,226,30,3,24,38,195,87,59,59,223,94,221,184,229,29,13,118,44,108,215, +25,6,121,189,254,224,141,47,120,133,219,45,243,47,203,84,233,165,234,81,167,153,243,90,205,244,188,236,194,28,93,220,137,19,92,69,185,164,47,254,203,149,61,233,217,108,247,168,157,158,107,60,28,167,140,209,27,82,167,119,103,4,195,114,197,129,116,90,46, +61,69,162,80,104,143,134,104,178,231,200,43,17,34,74,54,109,76,239,131,25,236,43,34,70,126,31,209,79,65,45,168,150,242,44,15,141,205,32,197,102,49,66,177,12,229,168,134,236,69,160,253,36,53,34,196,121,9,163,1,243,10,249,18,21,51,166,191,64,249,208,225, +139,65,174,85,177,139,39,214,225,137,225,50,174,80,158,225,42,198,2,158,61,12,180,81,69,227,51,162,68,53,64,150,125,67,236,29,50,7,80,119,165,39,51,212,121,252,61,82,7,72,236,6,174,246,177,163,169,73,6,182,136,56,91,234,210,45,118,116,139,129,110,4,215, +219,53,227,184,64,214,32,229,36,125,95,206,43,17,58,203,28,174,41,242,43,147,67,158,16,9,178,5,226,189,69,22,233,248,111,80,75,3,4,10,0,0,8,8,0,10,178,149,71,39,4,72,12,25,1,0,0,103,2,0,0,41,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47, +67,111,109,109,97,110,100,76,105,110,101,67,111,110,118,101,114,116,101,114,46,99,108,97,115,115,141,81,77,75,195,64,16,125,211,214,198,212,175,170,39,207,34,52,10,70,175,77,41,72,81,20,2,10,9,222,183,233,186,108,73,55,178,221,148,254,54,15,254,0,127, +148,184,77,161,4,147,66,23,150,157,121,179,239,189,97,230,231,247,235,27,192,61,206,29,116,29,156,18,156,36,83,11,174,13,161,223,11,167,108,193,252,148,41,225,191,24,174,217,56,229,65,9,123,29,79,121,98,2,175,10,17,58,143,203,132,127,26,153,169,185,131, +51,130,27,73,161,152,201,53,39,220,213,9,15,74,88,100,180,84,34,24,6,113,28,120,246,18,158,123,97,166,133,47,52,155,164,220,79,82,233,191,49,61,231,147,81,54,155,49,53,9,165,218,185,179,235,29,164,54,190,174,157,198,135,20,69,219,87,21,98,137,82,104, +232,192,123,39,244,6,113,191,106,60,172,157,82,148,229,58,225,79,50,181,250,23,37,185,209,122,9,92,223,174,88,132,203,237,206,155,175,132,238,127,11,194,205,118,226,131,22,249,140,43,179,217,84,155,64,104,96,117,154,45,66,19,45,155,237,217,172,101,241, +54,28,27,53,176,95,84,220,154,74,199,86,14,112,88,196,107,228,8,199,197,123,242,7,80,75,3,4,10,0,0,8,8,0,10,178,149,71,67,209,22,230,234,3,0,0,124,11,0,0,60,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105, +110,101,80,97,114,115,101,114,36,66,101,102,111,114,101,70,105,114,115,116,83,117,98,67,111,109,109,97,110,100,46,99,108,97,115,115,197,86,109,83,19,87,20,126,110,178,112,113,179,104,72,13,149,182,216,72,131,64,94,8,65,171,64,16,11,17,144,18,137,109, +148,54,216,183,77,88,211,213,100,215,217,108,170,127,161,63,161,255,194,206,180,131,150,169,246,91,103,250,165,255,163,63,162,211,115,119,99,8,38,176,193,113,166,95,238,203,185,207,61,231,185,207,158,123,246,254,245,239,111,47,0,164,113,95,198,89,204, +157,162,102,94,70,24,115,28,25,25,18,22,101,44,224,90,0,75,184,206,241,137,152,44,115,172,8,216,13,25,50,86,57,214,6,176,206,113,83,198,6,62,149,49,136,77,142,156,140,16,182,56,242,28,183,25,250,237,239,245,122,116,134,97,44,103,90,149,84,197,82,119, +171,90,170,92,213,83,89,179,86,83,141,221,156,110,104,183,85,171,174,89,25,66,47,234,134,110,47,49,172,79,122,195,95,71,56,230,221,54,92,102,106,155,65,202,154,187,26,195,25,97,216,106,212,74,154,117,71,45,85,201,18,202,153,101,181,186,173,90,186,152, +55,141,146,160,203,16,94,209,238,155,150,182,166,91,117,187,208,40,53,125,50,40,27,134,161,89,217,170,90,175,107,4,155,243,36,25,237,234,136,78,26,40,31,64,187,136,211,121,22,134,65,211,40,216,170,101,231,31,217,186,105,112,124,206,48,228,142,221,88, +180,104,147,175,157,201,220,3,245,7,53,85,85,141,74,170,96,91,186,81,201,116,90,166,188,169,119,248,38,14,126,213,170,8,233,58,252,209,183,51,29,60,137,228,14,220,5,154,230,15,77,83,189,6,110,57,30,106,147,42,223,140,113,92,54,185,152,12,71,129,1,12, +15,223,74,42,121,179,78,59,233,230,123,50,35,154,180,104,102,25,162,189,236,99,144,11,102,195,42,83,154,136,28,28,238,192,76,11,185,21,156,195,136,130,97,188,203,113,135,33,121,34,25,197,230,187,10,182,241,5,199,151,10,138,216,97,136,120,73,168,224,30, +190,98,152,247,140,116,215,120,104,152,143,141,46,201,120,238,168,37,5,23,48,38,88,125,203,16,63,58,192,178,85,105,212,52,195,94,125,82,214,154,159,254,66,211,101,164,153,22,201,42,225,34,110,206,69,38,198,235,19,211,12,193,131,252,204,151,30,104,101, +155,227,59,5,42,74,34,98,153,225,170,231,145,54,143,56,208,112,247,5,225,151,234,195,149,55,171,7,189,16,114,67,46,63,86,45,237,48,161,163,22,102,79,126,193,233,94,121,167,235,177,137,227,130,24,54,123,42,66,189,94,42,89,45,151,181,122,61,58,55,67,151, +235,82,15,247,121,202,141,213,176,245,106,234,150,250,72,20,207,67,6,42,100,21,205,102,184,216,78,211,205,148,87,123,219,77,7,12,230,5,131,241,94,24,236,112,144,158,129,67,234,254,216,77,149,183,80,122,218,107,116,175,154,6,95,103,66,21,156,82,179,166, +146,44,243,93,120,222,59,94,169,86,181,14,119,217,43,226,253,243,6,101,216,227,215,224,253,15,248,191,196,77,156,196,43,34,244,160,10,211,59,140,5,131,162,188,211,200,15,159,168,246,244,247,122,143,102,55,105,238,167,94,137,197,127,133,47,22,79,236,193, +255,51,205,125,120,159,218,211,98,141,93,67,31,91,66,128,93,199,7,100,27,166,53,194,99,148,124,195,25,81,181,37,27,195,71,184,216,244,250,55,6,208,71,189,182,15,169,24,79,176,61,244,109,197,126,129,239,25,250,19,207,193,125,248,3,3,11,210,136,244,39, +210,174,249,212,79,8,237,67,46,198,105,26,136,17,94,121,186,143,193,98,232,180,244,59,206,20,253,201,194,51,4,247,48,244,114,31,161,162,216,145,28,145,94,33,223,121,218,162,123,30,156,232,102,137,234,13,140,178,85,140,177,53,36,216,58,50,108,131,222, +139,57,135,254,101,151,88,139,190,134,9,76,18,109,49,154,162,145,15,1,236,32,134,4,29,125,148,228,73,98,26,82,16,36,89,186,121,184,60,173,72,212,115,71,45,118,160,86,191,112,195,22,157,48,49,23,210,10,195,49,75,234,51,103,116,201,209,75,140,46,227,99, +231,123,92,113,124,92,197,135,212,175,144,118,103,233,57,124,158,44,81,234,199,37,241,92,94,64,156,94,197,41,234,17,28,128,120,46,103,33,30,195,11,184,69,184,48,245,159,73,62,124,77,253,55,146,252,31,80,75,3,4,10,0,0,8,8,0,10,178,149,71,147,0,59,153, +124,1,0,0,252,2,0,0,57,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,83,121,115,116,101,109,80,114,111,112,101,114,116,105,101,115,67,111,109,109,97,110,100,76,105,110,101,67,111,110,118,101,114,116,101,114,46,99,108,97,115,115,157,146, +203,74,195,64,20,134,207,216,171,109,181,182,214,106,213,69,220,53,66,19,68,196,133,23,144,22,23,82,47,80,233,126,154,30,211,145,36,19,38,211,66,222,74,87,130,11,31,192,135,18,39,105,16,169,65,196,89,156,51,243,207,255,205,156,185,188,127,188,190,1,192, +1,108,151,32,15,141,34,108,20,161,89,132,205,2,108,21,160,69,32,127,202,60,38,207,9,100,218,250,144,64,182,203,199,72,160,218,103,30,222,76,221,17,138,123,58,114,148,82,239,115,139,58,67,42,88,52,78,196,172,156,176,128,192,81,159,11,219,180,5,29,59,104, +90,14,51,7,97,32,209,189,19,220,71,33,25,6,93,238,186,212,27,71,139,118,185,55,83,34,138,19,2,53,27,101,98,10,111,125,201,184,71,160,209,214,251,143,116,70,77,135,122,182,57,144,130,121,182,178,182,126,88,123,40,41,115,112,76,96,55,101,46,176,4,75,86, +44,13,248,84,88,120,201,162,138,245,191,148,102,68,5,84,160,0,69,2,164,71,160,28,196,80,199,87,20,129,227,1,74,109,174,104,126,178,173,198,31,52,57,65,237,106,120,173,181,209,176,13,173,211,115,195,104,246,204,13,103,212,153,162,110,16,56,252,199,53, +169,219,93,160,46,70,129,20,212,146,191,115,176,7,57,245,224,81,203,2,137,206,162,226,178,26,153,42,19,149,115,251,47,64,158,85,103,9,74,42,230,99,177,14,101,21,43,115,131,202,43,49,190,10,213,4,238,36,112,166,190,244,180,128,54,191,161,153,47,116,45, +5,205,44,162,59,169,104,45,5,205,46,162,90,10,170,62,107,236,90,255,4,80,75,3,4,10,0,0,8,8,0,10,178,149,71,45,21,104,130,7,2,0,0,187,4,0,0,50,0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97, +114,115,101,114,36,80,97,114,115,101,114,83,116,97,116,101,46,99,108,97,115,115,149,83,223,111,210,80,20,254,78,41,20,11,115,192,220,84,52,19,55,28,48,54,234,124,51,24,77,36,154,152,144,109,9,102,15,123,187,64,195,186,148,91,115,219,45,250,63,249,226, +139,38,62,248,7,248,71,25,207,109,217,100,131,4,105,210,158,31,247,156,239,124,231,156,219,223,127,126,254,2,112,0,199,70,26,219,54,50,216,206,162,106,227,25,118,44,212,45,52,8,153,87,158,244,162,215,132,84,189,113,66,48,59,193,208,37,172,118,61,233, +30,94,140,251,174,250,40,250,62,123,74,221,96,32,252,19,161,60,109,79,156,102,116,230,133,132,220,177,80,161,171,122,145,136,216,153,255,32,165,171,58,190,8,67,151,15,91,221,64,141,156,145,18,67,223,117,6,190,231,116,130,241,88,200,161,174,144,228,85, +167,210,219,132,194,88,124,233,187,108,169,232,232,83,228,5,146,176,94,239,158,139,75,225,248,66,142,156,94,164,60,57,106,55,78,9,89,47,188,10,73,9,53,210,44,103,226,8,43,129,156,66,179,176,75,40,38,250,13,222,167,115,138,204,41,187,184,157,25,108,230, +144,11,228,97,32,175,200,190,157,215,207,210,115,10,228,84,200,59,57,180,208,36,128,80,171,47,134,58,104,235,109,27,159,159,19,170,255,19,77,176,123,193,133,26,184,239,61,189,248,141,153,152,150,110,40,15,11,89,130,85,127,19,54,246,91,77,11,123,121,236, +163,104,161,69,216,91,166,61,238,238,223,128,142,250,231,238,32,34,188,88,126,242,132,173,197,205,221,40,150,108,131,123,24,139,104,112,166,47,112,101,17,130,89,225,191,43,3,253,88,48,244,8,120,9,119,216,114,88,242,70,144,222,253,1,227,27,43,6,108,254, +102,180,147,202,200,177,158,79,2,88,174,2,38,51,65,49,6,42,177,76,64,218,156,101,104,232,102,41,245,29,230,215,91,48,155,49,204,70,18,146,192,196,218,26,238,129,24,112,29,15,98,224,135,40,67,95,142,71,215,236,154,177,205,239,109,102,59,83,204,40,129, +44,104,200,205,73,226,75,150,198,164,173,153,228,242,20,159,244,53,159,52,158,160,18,167,61,141,227,183,112,151,101,25,41,62,169,97,197,180,57,163,134,251,44,31,179,68,33,251,23,80,75,3,4,10,0,0,8,8,0,10,178,149,71,70,182,8,247,61,3,0,0,202,9,0,0,59, +0,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,65,102,116,101,114,70,105,114,115,116,83,117,98,67,111,109,109,97,110,100,46,99,108,97,115,115,197,86,235,82,211,80,16,254, +78,91,8,164,1,74,5,196,59,98,101,160,45,180,5,17,176,120,41,85,46,82,40,88,69,209,95,161,196,26,40,9,147,6,241,21,124,0,223,3,103,116,80,153,113,252,231,140,143,226,67,56,238,73,10,20,75,155,194,48,227,159,179,123,118,247,124,103,119,179,187,57,191,254, +124,251,14,32,134,69,17,205,136,52,210,18,21,209,130,136,72,178,65,47,134,112,75,192,176,128,219,92,51,42,66,192,152,128,59,2,198,69,120,113,79,132,136,251,2,30,8,72,48,212,155,111,212,66,32,202,208,157,210,141,92,36,103,200,171,121,37,146,205,171,145, +164,190,177,33,107,171,41,85,83,22,100,163,160,24,113,178,30,87,53,213,188,199,48,213,235,108,254,175,133,37,94,45,177,139,247,45,49,120,146,250,170,194,208,194,5,243,91,27,43,138,241,84,94,201,147,196,159,210,179,114,126,73,54,84,190,47,10,61,220,93, +134,182,196,107,83,49,38,85,163,96,102,182,86,138,144,12,210,140,166,41,70,50,47,23,10,10,89,141,56,250,24,56,14,135,226,244,102,15,45,143,73,77,121,36,12,77,186,150,49,101,195,76,111,154,170,174,9,72,50,180,218,188,125,21,41,77,194,122,217,155,90,147, +223,202,145,188,172,229,34,25,211,80,181,92,188,92,210,231,236,121,25,54,249,224,150,141,28,79,92,25,30,125,57,221,178,39,167,74,66,75,23,101,213,190,189,109,19,23,240,144,1,12,235,103,242,225,157,195,139,89,197,225,122,23,229,75,140,47,131,12,129,90, +206,49,136,25,125,203,200,42,147,42,175,152,142,50,155,1,158,30,9,126,156,147,224,67,171,128,71,18,38,49,37,96,90,194,12,30,51,116,57,101,131,97,204,209,145,103,218,186,166,111,107,199,148,64,103,37,149,132,75,184,204,29,155,163,218,117,188,96,182,2, +124,71,37,69,127,141,53,101,215,12,117,83,233,150,187,53,207,151,52,195,240,169,218,170,150,152,236,27,19,219,178,161,28,141,169,146,98,240,228,125,66,229,238,92,69,85,139,192,54,162,58,147,179,89,165,80,8,140,70,169,74,135,106,104,140,62,187,51,183, +76,53,31,153,147,55,249,212,56,34,160,14,206,41,38,67,79,233,144,72,175,172,41,89,115,255,108,169,72,192,2,141,170,35,161,189,63,110,188,156,65,59,150,206,153,90,155,119,182,166,81,87,43,218,239,83,12,158,234,21,94,205,188,56,245,254,87,234,194,39,65, +69,23,253,229,91,232,61,192,124,62,62,208,136,115,195,197,231,27,205,235,54,218,77,211,222,77,84,10,134,62,195,21,12,133,119,225,254,72,123,23,218,105,109,230,58,182,136,58,246,4,94,150,65,7,201,58,72,71,246,56,143,139,128,197,209,100,34,25,195,21,186, +205,70,253,128,6,120,136,38,130,159,224,250,2,79,248,43,234,92,248,129,250,249,254,159,240,239,65,88,14,145,166,33,200,118,209,184,179,7,113,153,219,237,193,187,28,10,147,72,234,223,87,54,237,28,184,226,231,128,236,57,90,217,11,180,179,101,4,216,43,203, +157,160,125,209,129,59,9,92,71,55,185,193,185,27,196,185,40,232,40,2,184,9,183,143,163,244,22,93,76,83,104,252,164,96,197,204,14,99,174,231,135,217,66,9,184,112,0,46,160,143,224,152,197,5,173,168,57,23,66,216,202,106,191,133,49,128,11,68,39,40,3,205, +244,226,234,36,201,85,162,215,60,34,122,136,194,215,64,39,98,24,1,127,106,197,16,39,189,151,232,93,240,71,90,12,19,30,23,102,137,166,60,226,95,80,75,3,4,10,0,0,8,8,0,10,178,149,71,105,222,125,0,70,0,0,0,68,0,0,0,31,0,0,0,103,114,97,100,108,101,45,99, +108,105,45,99,108,97,115,115,112,97,116,104,46,112,114,111,112,101,114,116,105,101,115,83,206,205,79,41,205,73,85,72,73,77,203,204,203,44,201,204,207,227,82,246,205,207,83,112,73,77,86,48,50,84,48,50,178,50,52,179,50,50,80,112,118,13,81,48,50,48,52,229, +42,40,202,207,74,77,46,41,182,229,42,42,205,43,201,204,77,181,229,2,0,80,75,1,2,20,3,10,0,0,8,8,0,42,178,149,71,0,0,0,0,2,0,0,0,0,0,0,0,9,0,0,0,0,0,0,0,0,0,16,0,237,65,0,0,0,0,77,69,84,65,45,73,78,70,47,80,75,1,2,20,3,10,0,0,8,8,0,42,178,149,71,215,149, +152,82,63,0,0,0,85,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,164,129,41,0,0,0,77,69,84,65,45,73,78,70,47,77,65,78,73,70,69,83,84,46,77,70,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,0,0,0,0,2,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,16,0,253,65,154,0,0,0,111,114,103,47, +80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,0,0,0,0,2,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,16,0,253,65,190,0,0,0,111,114,103,47,103,114,97,100,108,101,47,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,0,0,0,0,2,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,16,0,253,65,233, +0,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,104,130,100,102,163,0,0,0,213,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,180,129,28,1,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112, +112,101,114,47,68,111,119,110,108,111,97,100,36,49,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,197,222,133,214,20,2,0,0,112,4,0,0,68,0,0,0,0,0,0,0,0,0,0,0,180,129,0,2,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112, +101,114,47,68,111,119,110,108,111,97,100,36,83,121,115,116,101,109,80,114,111,112,101,114,116,105,101,115,80,114,111,120,121,65,117,116,104,101,110,116,105,99,97,116,111,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,231,236,88,115, +170,0,0,0,219,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,180,129,118,4,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,73,68,111,119,110,108,111,97,100,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,4,169,122,221,92,2,0, +0,81,4,0,0,45,0,0,0,0,0,0,0,0,0,0,0,180,129,96,5,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,71,114,97,100,108,101,85,115,101,114,72,111,109,101,76,111,111,107,117,112,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22, +178,149,71,28,226,93,219,197,5,0,0,250,10,0,0,51,0,0,0,0,0,0,0,0,0,0,0,180,129,7,8,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,69,120,99,108,117,115,105,118,101,70,105,108,101,65,99,99,101,115,115,77,97,110,97,103,101,114, +46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,204,13,94,70,145,2,0,0,249,6,0,0,45,0,0,0,0,0,0,0,0,0,0,0,180,129,29,14,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,87,114,97,112,112,101,114,67,111,110,102, +105,103,117,114,97,116,105,111,110,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,81,125,29,105,229,4,0,0,25,10,0,0,48,0,0,0,0,0,0,0,0,0,0,0,180,129,249,16,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,83, +121,115,116,101,109,80,114,111,112,101,114,116,105,101,115,72,97,110,100,108,101,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,165,121,48,186,86,2,0,0,0,5,0,0,31,0,0,0,0,0,0,0,0,0,0,0,180,129,44,22,0,0,111,114,103,47,103,114,97,100, +108,101,47,119,114,97,112,112,101,114,47,76,111,103,103,101,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,206,114,235,138,21,7,0,0,110,14,0,0,38,0,0,0,0,0,0,0,0,0,0,0,180,129,191,24,0,0,111,114,103,47,103,114,97,100,108,101,47,119, +114,97,112,112,101,114,47,80,97,116,104,65,115,115,101,109,98,108,101,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,56,222,182,221,27,19,0,0,236,41,0,0,32,0,0,0,0,0,0,0,0,0,0,0,180,129,24,32,0,0,111,114,103,47,103,114,97,100,108, +101,47,119,114,97,112,112,101,114,47,73,110,115,116,97,108,108,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,221,192,76,137,196,4,0,0,149,9,0,0,45,0,0,0,0,0,0,0,0,0,0,0,180,129,113,51,0,0,111,114,103,47,103,114,97,100,108,101,47,119, +114,97,112,112,101,114,47,66,111,111,116,115,116,114,97,112,77,97,105,110,83,116,97,114,116,101,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,72,214,183,36,211,10,0,0,35,24,0,0,40,0,0,0,0,0,0,0,0,0,0,0,180,129,128,56,0,0,111,114, +103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,87,114,97,112,112,101,114,69,120,101,99,117,116,111,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,132,26,164,171,178,10,0,0,66,24,0,0,42,0,0,0,0,0,0,0,0,0,0,0,180,129, +153,67,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,71,114,97,100,108,101,87,114,97,112,112,101,114,77,97,105,110,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,217,206,17,120,160,6,0,0,180,14,0,0,34,0,0, +0,0,0,0,0,0,0,0,0,180,129,147,78,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,73,110,115,116,97,108,108,36,49,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,22,178,149,71,106,32,106,144,180,1,0,0,86,3,0,0,56,0,0,0,0,0, +0,0,0,0,0,0,180,129,115,85,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,80,97,116,104,65,115,115,101,109,98,108,101,114,36,76,111,99,97,108,68,105,115,116,114,105,98,117,116,105,111,110,46,99,108,97,115,115,80,75,1,2,20, +3,10,0,0,8,8,0,22,178,149,71,146,99,74,27,25,8,0,0,75,15,0,0,33,0,0,0,0,0,0,0,0,0,0,0,180,129,125,87,0,0,111,114,103,47,103,114,97,100,108,101,47,119,114,97,112,112,101,114,47,68,111,119,110,108,111,97,100,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8, +8,0,22,178,149,71,192,25,62,198,80,0,0,0,78,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,180,129,213,95,0,0,103,114,97,100,108,101,45,119,114,97,112,112,101,114,45,99,108,97,115,115,112,97,116,104,46,112,114,111,112,101,114,116,105,101,115,80,75,1,2,20,3,10,0,0,8, +8,0,10,178,149,71,36,217,150,101,206,0,0,0,28,1,0,0,24,0,0,0,0,0,0,0,0,0,0,0,180,129,102,96,0,0,98,117,105,108,100,45,114,101,99,101,105,112,116,46,112,114,111,112,101,114,116,105,101,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,0,0,0,0,2,0,0,0,0,0, +0,0,15,0,0,0,0,0,0,0,0,0,16,0,253,65,106,97,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,144,200,244,150,60,2,0,0,83,5,0,0,49,0,0,0,0,0,0,0,0,0,0,0,180,129,153,97,0,0,111,114,103,47,103,114,97,100, +108,101,47,99,108,105,47,65,98,115,116,114,97,99,116,67,111,109,109,97,110,100,76,105,110,101,67,111,110,118,101,114,116,101,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,50,95,101,143,166,0,0,0,232,0,0,0,40,0,0,0,0,0,0,0,0,0,0,0, +180,129,36,100,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,49,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,82,66,9,29,168,2,0,0,247,6,0,0,60,0,0,0,0,0, +0,0,0,0,0,0,180,129,16,101,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,77,105,115,115,105,110,103,79,112,116,105,111,110,65,114,103,83,116,97,116,101,46,99,108,97,115,115, +80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,188,172,77,50,145,2,0,0,131,5,0,0,61,0,0,0,0,0,0,0,0,0,0,0,180,129,18,104,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,79,112,116, +105,111,110,83,116,114,105,110,103,67,111,109,112,97,114,97,116,111,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,232,35,13,242,71,1,0,0,75,2,0,0,49,0,0,0,0,0,0,0,0,0,0,0,180,129,254,106,0,0,111,114,103,47,103,114,97,100,108,101, +47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,65,114,103,117,109,101,110,116,69,120,99,101,112,116,105,111,110,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,63,23,104,255,199,7,0,0,135,19,0,0,61,0,0,0,0,0,0,0,0,0,0,0,180, +129,148,108,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,75,110,111,119,110,79,112,116,105,111,110,80,97,114,115,101,114,83,116,97,116,101,46,99,108,97,115,115,80,75,1,2, +20,3,10,0,0,8,8,0,10,178,149,71,28,107,22,177,205,2,0,0,219,6,0,0,55,0,0,0,0,0,0,0,0,0,0,0,180,129,182,116,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,79,112,116,105,111, +110,67,111,109,112,97,114,97,116,111,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,228,98,213,39,225,2,0,0,110,7,0,0,63,0,0,0,0,0,0,0,0,0,0,0,180,129,216,119,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109, +97,110,100,76,105,110,101,80,97,114,115,101,114,36,85,110,107,110,111,119,110,79,112,116,105,111,110,80,97,114,115,101,114,83,116,97,116,101,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,34,122,201,90,146,5,0,0,153,13,0,0,38,0,0,0,0, +0,0,0,0,0,0,0,180,129,22,123,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,79,112,116,105,111,110,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,156,108,92,207,167,1,0,0,166,3,0,0, +56,0,0,0,0,0,0,0,0,0,0,0,180,129,236,128,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,79,112,116,105,111,110,80,97,114,115,101,114,83,116,97,116,101,46,99,108,97,115,115, +80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,91,120,110,152,148,7,0,0,199,17,0,0,38,0,0,0,0,0,0,0,0,0,0,0,180,129,233,130,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,80,97,114,115,101,100,67,111,109,109,97,110,100,76,105,110,101,46,99,108, +97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,139,65,53,108,124,1,0,0,11,3,0,0,58,0,0,0,0,0,0,0,0,0,0,0,180,129,193,138,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,80,114,111,106,101,99,116,80,114,111,112,101,114,116,105,101,115, +67,111,109,109,97,110,100,76,105,110,101,67,111,110,118,101,114,116,101,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,50,108,87,182,74,2,0,0,4,5,0,0,70,0,0,0,0,0,0,0,0,0,0,0,180,129,149,140,0,0,111,114,103,47,103,114,97,100,108,101, +47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,67,97,115,101,73,110,115,101,110,115,105,116,105,118,101,83,116,114,105,110,103,67,111,109,112,97,114,97,116,111,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10, +178,149,71,133,165,180,23,103,18,0,0,198,42,0,0,38,0,0,0,0,0,0,0,0,0,0,0,180,129,67,143,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0, +0,8,8,0,10,178,149,71,95,15,62,210,163,2,0,0,41,7,0,0,51,0,0,0,0,0,0,0,0,0,0,0,180,129,238,161,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,65,102,116,101,114,79,112,116, +105,111,110,115,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,71,209,102,236,146,2,0,0,156,5,0,0,51,0,0,0,0,0,0,0,0,0,0,0,180,129,226,164,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110, +101,80,97,114,115,101,114,36,79,112,116,105,111,110,83,116,114,105,110,103,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,120,38,226,84,96,4,0,0,26,11,0,0,59,0,0,0,0,0,0,0,0,0,0,0,180,129,197,167,0,0,111,114,103,47,103,114,97,100,108, +101,47,99,108,105,47,65,98,115,116,114,97,99,116,80,114,111,112,101,114,116,105,101,115,67,111,109,109,97,110,100,76,105,110,101,67,111,110,118,101,114,116,101,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,147,157,188,21,188,2,0, +0,32,5,0,0,44,0,0,0,0,0,0,0,0,0,0,0,180,129,126,172,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,80,97,114,115,101,100,67,111,109,109,97,110,100,76,105,110,101,79,112,116,105,111,110,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178, +149,71,182,192,176,115,152,2,0,0,170,6,0,0,61,0,0,0,0,0,0,0,0,0,0,0,180,129,132,175,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,79,112,116,105,111,110,65,119,97,114,101, +80,97,114,115,101,114,83,116,97,116,101,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,39,4,72,12,25,1,0,0,103,2,0,0,41,0,0,0,0,0,0,0,0,0,0,0,180,129,119,178,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97, +110,100,76,105,110,101,67,111,110,118,101,114,116,101,114,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,67,209,22,230,234,3,0,0,124,11,0,0,60,0,0,0,0,0,0,0,0,0,0,0,180,129,215,179,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105, +47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,66,101,102,111,114,101,70,105,114,115,116,83,117,98,67,111,109,109,97,110,100,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,147,0,59,153,124,1,0,0,252,2,0,0,57,0,0, +0,0,0,0,0,0,0,0,0,180,129,27,184,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,83,121,115,116,101,109,80,114,111,112,101,114,116,105,101,115,67,111,109,109,97,110,100,76,105,110,101,67,111,110,118,101,114,116,101,114,46,99,108,97,115,115, +80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,45,21,104,130,7,2,0,0,187,4,0,0,50,0,0,0,0,0,0,0,0,0,0,0,180,129,238,185,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100,76,105,110,101,80,97,114,115,101,114,36,80,97,114, +115,101,114,83,116,97,116,101,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,70,182,8,247,61,3,0,0,202,9,0,0,59,0,0,0,0,0,0,0,0,0,0,0,180,129,69,188,0,0,111,114,103,47,103,114,97,100,108,101,47,99,108,105,47,67,111,109,109,97,110,100, +76,105,110,101,80,97,114,115,101,114,36,65,102,116,101,114,70,105,114,115,116,83,117,98,67,111,109,109,97,110,100,46,99,108,97,115,115,80,75,1,2,20,3,10,0,0,8,8,0,10,178,149,71,105,222,125,0,70,0,0,0,68,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,180,129,219,191, +0,0,103,114,97,100,108,101,45,99,108,105,45,99,108,97,115,115,112,97,116,104,46,112,114,111,112,101,114,116,105,101,115,80,75,5,6,0,0,0,0,49,0,49,0,16,17,0,0,94,192,0,0,0,0,0,0 }; + +const char* gradlewrapper_jar = (const char*) temp_binary_data_0; + +//================== gradlew ================== +static const unsigned char temp_binary_data_1[] = +"#!/usr/bin/env bash\n" +"\n" +"##############################################################################\n" +"##\n" +"## Gradle start up script for UN*X\n" +"##\n" +"##############################################################################\n" +"\n" +"# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.\n" +"DEFAULT_JVM_OPTS=\"\"\n" +"\n" +"APP_NAME=\"Gradle\"\n" +"APP_BASE_NAME=`basename \"$0\"`\n" +"\n" +"# Use the maximum available, or set MAX_FD != -1 to use that value.\n" +"MAX_FD=\"maximum\"\n" +"\n" +"warn ( ) {\n" +" echo \"$*\"\n" +"}\n" +"\n" +"die ( ) {\n" +" echo\n" +" echo \"$*\"\n" +" echo\n" +" exit 1\n" +"}\n" +"\n" +"# OS specific support (must be 'true' or 'false').\n" +"cygwin=false\n" +"msys=false\n" +"darwin=false\n" +"case \"`uname`\" in\n" +" CYGWIN* )\n" +" cygwin=true\n" +" ;;\n" +" Darwin* )\n" +" darwin=true\n" +" ;;\n" +" MINGW* )\n" +" msys=true\n" +" ;;\n" +"esac\n" +"\n" +"# Attempt to set APP_HOME\n" +"# Resolve links: $0 may be a link\n" +"PRG=\"$0\"\n" +"# Need this for relative symlinks.\n" +"while [ -h \"$PRG\" ] ; do\n" +" ls=`ls -ld \"$PRG\"`\n" +" link=`expr \"$ls\" : '.*-> \$.*\$$'`\n" +" if expr \"$link\" : '/.*' > /dev/null; then\n" +" PRG=\"$link\"\n" +" else\n" +" PRG=`dirname \"$PRG\"`\"/$link\"\n" +" fi\n" +"done\n" +"SAVED=\"`pwd`\"\n" +"cd \"`dirname \\\"$PRG\\\"`/\" >/dev/null\n" +"APP_HOME=\"`pwd -P`\"\n" +"cd \"$SAVED\" >/dev/null\n" +"\n" +"CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar\n" +"\n" +"# Determine the Java command to use to start the JVM.\n" +"if [ -n \"$JAVA_HOME\" ] ; then\n" +" if [ -x \"$JAVA_HOME/jre/sh/java\" ] ; then\n" +" # IBM's JDK on AIX uses strange locations for the executables\n" +" JAVACMD=\"$JAVA_HOME/jre/sh/java\"\n" +" else\n" +" JAVACMD=\"$JAVA_HOME/bin/java\"\n" +" fi\n" +" if [ ! -x \"$JAVACMD\" ] ; then\n" +" die \"ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME\n" +"\n" +"Please set the JAVA_HOME variable in your environment to match the\n" +"location of your Java installation.\"\n" +" fi\n" +"else\n" +" JAVACMD=\"java\"\n" +" which java >/dev/null 2>&1 || die \"ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.\n" +"\n" +"Please set the JAVA_HOME variable in your environment to match the\n" +"location of your Java installation.\"\n" +"fi\n" +"\n" +"# Increase the maximum file descriptors if we can.\n" +"if [ \"$cygwin\" = \"false\" -a \"$darwin\" = \"false\" ] ; then\n" +" MAX_FD_LIMIT=`ulimit -H -n`\n" +" if [ $? -eq 0 ] ; then\n" +" if [ \"$MAX_FD\" = \"maximum\" -o \"$MAX_FD\" = \"max\" ] ; then\n" +" MAX_FD=\"$MAX_FD_LIMIT\"\n" +" fi\n" +" ulimit -n $MAX_FD\n" +" if [ $? -ne 0 ] ; then\n" +" warn \"Could not set maximum file descriptor limit: $MAX_FD\"\n" +" fi\n" +" else\n" +" warn \"Could not query maximum file descriptor limit: $MAX_FD_LIMIT\"\n" +" fi\n" +"fi\n" +"\n" +"# For Darwin, add options to specify how the application appears in the dock\n" +"if $darwin; then\n" +" GRADLE_OPTS=\"$GRADLE_OPTS \\\"-Xdock:name=$APP_NAME\\\" \\\"-Xdock:icon=$APP_HOME/media/gradle.icns\\\"\"\n" +"fi\n" +"\n" +"# For Cygwin, switch paths to Windows format before running java\n" +"if $cygwin ; then\n" +" APP_HOME=`cygpath --path --mixed \"$APP_HOME\"`\n" +" CLASSPATH=`cygpath --path --mixed \"$CLASSPATH\"`\n" +" JAVACMD=`cygpath --unix \"$JAVACMD\"`\n" +"\n" +" # We build the pattern for arguments to be converted via cygpath\n" +" ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`\n" +" SEP=\"\"\n" +" for dir in $ROOTDIRSRAW ; do\n" +" ROOTDIRS=\"$ROOTDIRS$SEP$dir\"\n" +" SEP=\"|\"\n" +" done\n" +" OURCYGPATTERN=\"(^($ROOTDIRS))\"\n" +" # Add a user-defined pattern to the cygpath arguments\n" +" if [ \"$GRADLE_CYGPATTERN\" != \"\" ] ; then\n" +" OURCYGPATTERN=\"$OURCYGPATTERN|($GRADLE_CYGPATTERN)\"\n" +" fi\n" +" # Now convert the arguments - kludge to limit ourselves to /bin/sh\n" +" i=0\n" +" for arg in \"$@\" ; do\n" +" CHECK=`echo \"$arg\"|egrep -c \"$OURCYGPATTERN\" -`\n" +" CHECK2=`echo \"$arg\"|egrep -c \"^-\"` ### Determine if an option\n" +"\n" +" if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition\n" +" eval `echo args$i`=`cygpath --path --ignore --mixed \"$arg\"`\n" +" else\n" +" eval `echo args$i`=\"\\\"$arg\\\"\"\n" +" fi\n" +" i=$((i+1))\n" +" done\n" +" case $i in\n" +" (0) set -- ;;\n" +" (1) set -- \"$args0\" ;;\n" +" (2) set -- \"$args0\" \"$args1\" ;;\n" +" (3) set -- \"$args0\" \"$args1\" \"$args2\" ;;\n" +" (4) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" ;;\n" +" (5) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" ;;\n" +" (6) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" ;;\n" +" (7) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" ;;\n" +" (8) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" \"$args7\" ;;\n" +" (9) set -- \"$args0\" \"$args1\" \"$args2\" \"$args3\" \"$args4\" \"$args5\" \"$args6\" \"$args7\" \"$args8\" ;;\n" +" esac\n" +"fi\n" +"\n" +"# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules\n" +"function splitJvmOpts() {\n" +" JVM_OPTS=(\"$@\")\n" +"}\n" +"eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS\n" +"JVM_OPTS[${#JVM_OPTS[*]}]=\"-Dorg.gradle.appname=$APP_BASE_NAME\"\n" +"\n" +"exec \"$JAVACMD\" \"${JVM_OPTS[@]}\" -classpath \"$CLASSPATH\" org.gradle.wrapper.GradleWrapperMain \"$@\"\n"; + +const char* gradlew = (const char*) temp_binary_data_1; + +//================== gradlew.bat ================== +static const unsigned char temp_binary_data_2[] = +"@if \"%DEBUG%\" == \"\" @echo off\r\n" +"@rem ##########################################################################\r\n" +"@rem\r\n" +"@rem Gradle startup script for Windows\r\n" +"@rem\r\n" +"@rem ##########################################################################\r\n" +"\r\n" +"@rem Set local scope for the variables with windows NT shell\r\n" +"if \"%OS%\"==\"Windows_NT\" setlocal\r\n" +"\r\n" +"@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.\r\n" +"set DEFAULT_JVM_OPTS=\r\n" +"\r\n" +"set DIRNAME=%~dp0\r\n" +"if \"%DIRNAME%\" == \"\" set DIRNAME=.\r\n" +"set APP_BASE_NAME=%~n0\r\n" +"set APP_HOME=%DIRNAME%\r\n" +"\r\n" +"@rem Find java.exe\r\n" +"if defined JAVA_HOME goto findJavaFromJavaHome\r\n" +"\r\n" +"set JAVA_EXE=java.exe\r\n" +"%JAVA_EXE% -version >NUL 2>&1\r\n" +"if \"%ERRORLEVEL%\" == \"0\" goto init\r\n" +"\r\n" +"echo.\r\n" +"echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.\r\n" +"echo.\r\n" +"echo Please set the JAVA_HOME variable in your environment to match the\r\n" +"echo location of your Java installation.\r\n" +"\r\n" +"goto fail\r\n" +"\r\n" +":findJavaFromJavaHome\r\n" +"set JAVA_HOME=%JAVA_HOME:\"=%\r\n" +"set JAVA_EXE=%JAVA_HOME%/bin/java.exe\r\n" +"\r\n" +"if exist \"%JAVA_EXE%\" goto init\r\n" +"\r\n" +"echo.\r\n" +"echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%\r\n" +"echo.\r\n" +"echo Please set the JAVA_HOME variable in your environment to match the\r\n" +"echo location of your Java installation.\r\n" +"\r\n" +"goto fail\r\n" +"\r\n" +":init\r\n" +"@rem Get command-line arguments, handling Windowz variants\r\n" +"\r\n" +"if not \"%OS%\" == \"Windows_NT\" goto win9xME_args\r\n" +"if \"%@eval[2+2]\" == \"4\" goto 4NT_args\r\n" +"\r\n" +":win9xME_args\r\n" +"@rem Slurp the command line arguments.\r\n" +"set CMD_LINE_ARGS=\r\n" +"set _SKIP=2\r\n" +"\r\n" +":win9xME_args_slurp\r\n" +"if \"x%~1\" == \"x\" goto execute\r\n" +"\r\n" +"set CMD_LINE_ARGS=%*\r\n" +"goto execute\r\n" +"\r\n" +":4NT_args\r\n" +"@rem Get arguments from the 4NT Shell from JP Software\r\n" +"set CMD_LINE_ARGS=%$\r\n" +"\r\n" +":execute\r\n" +"@rem Setup the command line\r\n" +"\r\n" +"set CLASSPATH=%APP_HOME%\\gradle\\wrapper\\gradle-wrapper.jar\r\n" +"\r\n" +"@rem Execute Gradle\r\n" +"\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% \"-Dorg.gradle.appname=%APP_BASE_NAME%\" -classpath \"%CLASSPATH%\" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%\r\n" +"\r\n" +":end\r\n" +"@rem End local scope for the variables with windows NT shell\r\n" +"if \"%ERRORLEVEL%\"==\"0\" goto mainEnd\r\n" +"\r\n" +":fail\r\n" +"rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of\r\n" +"rem the _cmd.exe /c_ return code!\r\n" +"if not \"\" == \"%GRADLE_EXIT_CONSOLE%\" exit 1\r\n" +"exit /b 1\r\n" +"\r\n" +":mainEnd\r\n" +"if \"%OS%\"==\"Windows_NT\" endlocal\r\n" +"\r\n" +":omega\r\n"; + +const char* gradlew_bat = (const char*) temp_binary_data_2; + +//================== LICENSE ================== +static const unsigned char temp_binary_data_3[] = +"Apache License\n" +" Version 2.0, January 2004\n" +" http://www.apache.org/licenses/\n" +"\n" +" TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n" +"\n" +" 1. Definitions.\n" +"\n" +" \"License\" shall mean the terms and conditions for use, reproduction,\n" +" and distribution as defined by Sections 1 through 9 of this document.\n" +"\n" +" \"Licensor\" shall mean the copyright owner or entity authorized by\n" +" the copyright owner that is granting the License.\n" +"\n" +" \"Legal Entity\" shall mean the union of the acting entity and all\n" +" other entities that control, are controlled by, or are under common\n" +" control with that entity. For the purposes of this definition,\n" +" \"control\" means (i) the power, direct or indirect, to cause the\n" +" direction or management of such entity, whether by contract or\n" +" otherwise, or (ii) ownership of fifty percent (50%) or more of the\n" +" outstanding shares, or (iii) beneficial ownership of such entity.\n" +"\n" +" \"You\" (or \"Your\") shall mean an individual or Legal Entity\n" +" exercising permissions granted by this License.\n" +"\n" +" \"Source\" form shall mean the preferred form for making modifications,\n" +" including but not limited to software source code, documentation\n" +" source, and configuration files.\n" +"\n" +" \"Object\" form shall mean any form resulting from mechanical\n" +" transformation or translation of a Source form, including but\n" +" not limited to compiled object code, generated documentation,\n" +" and conversions to other media types.\n" +"\n" +" \"Work\" shall mean the work of authorship, whether in Source or\n" +" Object form, made available under the License, as indicated by a\n" +" copyright notice that is included in or attached to the work\n" +" (an example is provided in the Appendix below).\n" +"\n" +" \"Derivative Works\" shall mean any work, whether in Source or Object\n" +" form, that is based on (or derived from) the Work and for which the\n" +" editorial revisions, annotations, elaborations, or other modifications\n" +" represent, as a whole, an original work of authorship. For the purposes\n" +" of this License, Derivative Works shall not include works that remain\n" +" separable from, or merely link (or bind by name) to the interfaces of,\n" +" the Work and Derivative Works thereof.\n" +"\n" +" \"Contribution\" shall mean any work of authorship, including\n" +" the original version of the Work and any modifications or additions\n" +" to that Work or Derivative Works thereof, that is intentionally\n" +" submitted to Licensor for inclusion in the Work by the copyright owner\n" +" or by an individual or Legal Entity authorized to submit on behalf of\n" +" the copyright owner. For the purposes of this definition, \"submitted\"\n" +" means any form of electronic, verbal, or written communication sent\n" +" to the Licensor or its representatives, including but not limited to\n" +" communication on electronic mailing lists, source code control systems,\n" +" and issue tracking systems that are managed by, or on behalf of, the\n" +" Licensor for the purpose of discussing and improving the Work, but\n" +" excluding communication that is conspicuously marked or otherwise\n" +" designated in writing by the copyright owner as \"Not a Contribution.\"\n" +"\n" +" \"Contributor\" shall mean Licensor and any individual or Legal Entity\n" +" on behalf of whom a Contribution has been received by Licensor and\n" +" subsequently incorporated within the Work.\n" +"\n" +" 2. Grant of Copyright License. Subject to the terms and conditions of\n" +" this License, each Contributor hereby grants to You a perpetual,\n" +" worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n" +" copyright license to reproduce, prepare Derivative Works of,\n" +" publicly display, publicly perform, sublicense, and distribute the\n" +" Work and such Derivative Works in Source or Object form.\n" +"\n" +" 3. Grant of Patent License. Subject to the terms and conditions of\n" +" this License, each Contributor hereby grants to You a perpetual,\n" +" worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n" +" (except as stated in this section) patent license to make, have made,\n" +" use, offer to sell, sell, import, and otherwise transfer the Work,\n" +" where such license applies only to those patent claims licensable\n" +" by such Contributor that are necessarily infringed by their\n" +" Contribution(s) alone or by combination of their Contribution(s)\n" +" with the Work to which such Contribution(s) was submitted. If You\n" +" institute patent litigation against any entity (including a\n" +" cross-claim or counterclaim in a lawsuit) alleging that the Work\n" +" or a Contribution incorporated within the Work constitutes direct\n" +" or contributory patent infringement, then any patent licenses\n" +" granted to You under this License for that Work shall terminate\n" +" as of the date such litigation is filed.\n" +"\n" +" 4. Redistribution. You may reproduce and distribute copies of the\n" +" Work or Derivative Works thereof in any medium, with or without\n" +" modifications, and in Source or Object form, provided that You\n" +" meet the following conditions:\n" +"\n" +" (a) You must give any other recipients of the Work or\n" +" Derivative Works a copy of this License; and\n" +"\n" +" (b) You must cause any modified files to carry prominent notices\n" +" stating that You changed the files; and\n" +"\n" +" (c) You must retain, in the Source form of any Derivative Works\n" +" that You distribute, all copyright, patent, trademark, and\n" +" attribution notices from the Source form of the Work,\n" +" excluding those notices that do not pertain to any part of\n" +" the Derivative Works; and\n" +"\n" +" (d) If the Work includes a \"NOTICE\" text file as part of its\n" +" distribution, then any Derivative Works that You distribute must\n" +" include a readable copy of the attribution notices contained\n" +" within such NOTICE file, excluding those notices that do not\n" +" pertain to any part of the Derivative Works, in at least one\n" +" of the following places: within a NOTICE text file distributed\n" +" as part of the Derivative Works; within the Source form or\n" +" documentation, if provided along with the Derivative Works; or,\n" +" within a display generated by the Derivative Works, if and\n" +" wherever such third-party notices normally appear. The contents\n" +" of the NOTICE file are for informational purposes only and\n" +" do not modify the License. You may add Your own attribution\n" +" notices within Derivative Works that You distribute, alongside\n" +" or as an addendum to the NOTICE text from the Work, provided\n" +" that such additional attribution notices cannot be construed\n" +" as modifying the License.\n" +"\n" +" You may add Your own copyright statement to Your modifications and\n" +" may provide additional or different license terms and conditions\n" +" for use, reproduction, or distribution of Your modifications, or\n" +" for any such Derivative Works as a whole, provided Your use,\n" +" reproduction, and distribution of the Work otherwise complies with\n" +" the conditions stated in this License.\n" +"\n" +" 5. Submission of Contributions. Unless You explicitly state otherwise,\n" +" any Contribution intentionally submitted for inclusion in the Work\n" +" by You to the Licensor shall be under the terms and conditions of\n" +" this License, without any additional terms or conditions.\n" +" Notwithstanding the above, nothing herein shall supersede or modify\n" +" the terms of any separate license agreement you may have executed\n" +" with Licensor regarding such Contributions.\n" +"\n" +" 6. Trademarks. This License does not grant permission to use the trade\n" +" names, trademarks, service marks, or product names of the Licensor,\n" +" except as required for reasonable and customary use in describing the\n" +" origin of the Work and reproducing the content of the NOTICE file.\n" +"\n" +" 7. Disclaimer of Warranty. Unless required by applicable law or\n" +" agreed to in writing, Licensor provides the Work (and each\n" +" Contributor provides its Contributions) on an \"AS IS\" BASIS,\n" +" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n" +" implied, including, without limitation, any warranties or conditions\n" +" of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n" +" PARTICULAR PURPOSE. You are solely responsible for determining the\n" +" appropriateness of using or redistributing the Work and assume any\n" +" risks associated with Your exercise of permissions under this License.\n" +"\n" +" 8. Limitation of Liability. In no event and under no legal theory,\n" +" whether in tort (including negligence), contract, or otherwise,\n" +" unless required by applicable law (such as deliberate and grossly\n" +" negligent acts) or agreed to in writing, shall any Contributor be\n" +" liable to You for damages, including any direct, indirect, special,\n" +" incidental, or consequential damages of any character arising as a\n" +" result of this License or out of the use or inability to use the\n" +" Work (including but not limited to damages for loss of goodwill,\n" +" work stoppage, computer failure or malfunction, or any and all\n" +" other commercial damages or losses), even if such Contributor\n" +" has been advised of the possibility of such damages.\n" +"\n" +" 9. Accepting Warranty or Additional Liability. While redistributing\n" +" the Work or Derivative Works thereof, You may choose to offer,\n" +" and charge a fee for, acceptance of support, warranty, indemnity,\n" +" or other liability obligations and/or rights consistent with this\n" +" License. However, in accepting such obligations, You may act only\n" +" on Your own behalf and on Your sole responsibility, not on behalf\n" +" of any other Contributor, and only if You agree to indemnify,\n" +" defend, and hold each Contributor harmless for any liability\n" +" incurred by, or claims asserted against, such Contributor by reason\n" +" of your accepting any such warranty or additional liability.\n" +"\n" +" END OF TERMS AND CONDITIONS\n" +"\n" +" APPENDIX: How to apply the Apache License to your work.\n" +"\n" +" To apply the Apache License to your work, attach the following\n" +" boilerplate notice, with the fields enclosed by brackets \"{}\"\n" +" replaced with your own identifying information. (Don't include\n" +" the brackets!) The text should be enclosed in the appropriate\n" +" comment syntax for the file format. We also recommend that a\n" +" file or class name and description of purpose be included on the\n" +" same \"printed page\" as the copyright notice for easier\n" +" identification within third-party archives.\n" +"\n" +" Copyright {yyyy} {name of copyright owner}\n" +"\n" +" Licensed under the Apache License, Version 2.0 (the \"License\");\n" +" you may not use this file except in compliance with the License.\n" +" You may obtain a copy of the License at\n" +"\n" +" http://www.apache.org/licenses/LICENSE-2.0\n" +"\n" +" Unless required by applicable law or agreed to in writing, software\n" +" distributed under the License is distributed on an \"AS IS\" BASIS,\n" +" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" +" See the License for the specific language governing permissions and\n" +" limitations under the License.\n" +"\n"; + +const char* LICENSE = (const char*) temp_binary_data_3; + +//================== jucer_AnimatedComponentTemplate.cpp ================== +static const unsigned char temp_binary_data_4[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -81,10 +1303,10 @@ static const unsigned char temp_binary_data_0[] = "\r\n" "#endif // MAINCOMPONENT_H_INCLUDED\r\n"; -const char* jucer_AnimatedComponentTemplate_cpp = (const char*) temp_binary_data_0; +const char* jucer_AnimatedComponentTemplate_cpp = (const char*) temp_binary_data_4; //================== jucer_AudioComponentTemplate.cpp ================== -static const unsigned char temp_binary_data_1[] = +static const unsigned char temp_binary_data_5[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -185,10 +1407,10 @@ static const unsigned char temp_binary_data_1[] = "\r\n" "#endif // MAINCOMPONENT_H_INCLUDED\r\n"; -const char* jucer_AudioComponentTemplate_cpp = (const char*) temp_binary_data_1; +const char* jucer_AudioComponentTemplate_cpp = (const char*) temp_binary_data_5; //================== jucer_AudioPluginEditorTemplate.cpp ================== -static const unsigned char temp_binary_data_2[] = +static const unsigned char temp_binary_data_6[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -231,10 +1453,10 @@ static const unsigned char temp_binary_data_2[] = " // subcomponents in your editor..\r\n" "}\r\n"; -const char* jucer_AudioPluginEditorTemplate_cpp = (const char*) temp_binary_data_2; +const char* jucer_AudioPluginEditorTemplate_cpp = (const char*) temp_binary_data_6; //================== jucer_AudioPluginEditorTemplate.h ================== -static const unsigned char temp_binary_data_3[] = +static const unsigned char temp_binary_data_7[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -275,10 +1497,10 @@ static const unsigned char temp_binary_data_3[] = "\r\n" "#endif // HEADERGUARD\r\n"; -const char* jucer_AudioPluginEditorTemplate_h = (const char*) temp_binary_data_3; +const char* jucer_AudioPluginEditorTemplate_h = (const char*) temp_binary_data_7; //================== jucer_AudioPluginFilterTemplate.cpp ================== -static const unsigned char temp_binary_data_4[] = +static const unsigned char temp_binary_data_8[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -294,6 +1516,16 @@ static const unsigned char temp_binary_data_4[] = "\r\n" "//==============================================================================\r\n" "FILTERCLASSNAME::FILTERCLASSNAME()\r\n" +"#ifndef JucePlugin_PreferredChannelConfigurations\r\n" +" : AudioProcessor (BusesProperties()\r\n" +" #if ! JucePlugin_IsMidiEffect\r\n" +" #if ! JucePlugin_IsSynth\r\n" +" .withInput (\"Input\", AudioChannelSet::stereo(), true)\r\n" +" #endif\r\n" +" .withOutput (\"Output\", AudioChannelSet::stereo(), true)\r\n" +" #endif\r\n" +" )\r\n" +"#endif\r\n" "{\r\n" "}\r\n" "\r\n" @@ -368,27 +1600,26 @@ static const unsigned char temp_binary_data_4[] = "}\r\n" "\r\n" "#ifndef JucePlugin_PreferredChannelConfigurations\r\n" -"bool FILTERCLASSNAME::setPreferredBusArrangement (bool isInput, int bus, const AudioChannelSet& preferredSet)\r\n" +"bool FILTERCLASSNAME::isBusesLayoutSupported (const BusesLayout& layouts) const\r\n" "{\r\n" -" // Reject any bus arrangements that are not compatible with your plugin\r\n" -"\r\n" -" const int numChannels = preferredSet.size();\r\n" -"\r\n" -" #if JucePlugin_IsMidiEffect\r\n" -" if (numChannels != 0)\r\n" -" return false;\r\n" -" #elif JucePlugin_IsSynth\r\n" -" if (isInput || (numChannels != 1 && numChannels != 2))\r\n" -" return false;\r\n" -" #else\r\n" -" if (numChannels != 1 && numChannels != 2)\r\n" +" #if JucePlugin_IsMidiEffect\r\n" +" ignoreUnused (layouts);\r\n" +" return true;\r\n" +" #else\r\n" +" // This is the place where you check if the layout is supported.\r\n" +" // In this template code we only support mono or stereo.\r\n" +" if (layouts.getMainOutputChannelSet() != AudioChannelSet::mono()\r\n" +" && layouts.getMainOutputChannelSet() != AudioChannelSet::stereo())\r\n" " return false;\r\n" "\r\n" -" if (! AudioProcessor::setPreferredBusArrangement (! isInput, bus, preferredSet))\r\n" +" // This checks if the input layout matches the output layout\r\n" +" #if ! JucePlugin_IsSynth\r\n" +" if (layouts.getMainOutputChannelSet() != layouts.getMainInputChannelSet())\r\n" " return false;\r\n" " #endif\r\n" "\r\n" -" return AudioProcessor::setPreferredBusArrangement (isInput, bus, preferredSet);\r\n" +" return true;\r\n" +" #endif\r\n" "}\r\n" "#endif\r\n" "\r\n" @@ -448,10 +1679,10 @@ static const unsigned char temp_binary_data_4[] = " return new FILTERCLASSNAME();\r\n" "}\r\n"; -const char* jucer_AudioPluginFilterTemplate_cpp = (const char*) temp_binary_data_4; +const char* jucer_AudioPluginFilterTemplate_cpp = (const char*) temp_binary_data_8; //================== jucer_AudioPluginFilterTemplate.h ================== -static const unsigned char temp_binary_data_5[] = +static const unsigned char temp_binary_data_9[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -483,7 +1714,7 @@ static const unsigned char temp_binary_data_5[] = " void releaseResources() override;\r\n" "\r\n" " #ifndef JucePlugin_PreferredChannelConfigurations\r\n" -" bool setPreferredBusArrangement (bool isInput, int bus, const AudioChannelSet& preferredSet) override;\r\n" +" bool isBusesLayoutSupported (const BusesLayout& layouts) const override;\r\n" " #endif\r\n" "\r\n" " void processBlock (AudioSampleBuffer&, MidiBuffer&) override;\r\n" @@ -518,10 +1749,10 @@ static const unsigned char temp_binary_data_5[] = "\r\n" "#endif // HEADERGUARD\r\n"; -const char* jucer_AudioPluginFilterTemplate_h = (const char*) temp_binary_data_5; +const char* jucer_AudioPluginFilterTemplate_h = (const char*) temp_binary_data_9; //================== jucer_ComponentTemplate.cpp ================== -static const unsigned char temp_binary_data_6[] = +static const unsigned char temp_binary_data_10[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -597,10 +1828,10 @@ static const unsigned char temp_binary_data_6[] = "//[EndFile] You can add extra defines here...\r\n" "//[/EndFile]\r\n"; -const char* jucer_ComponentTemplate_cpp = (const char*) temp_binary_data_6; +const char* jucer_ComponentTemplate_cpp = (const char*) temp_binary_data_10; //================== jucer_ComponentTemplate.h ================== -static const unsigned char temp_binary_data_7[] = +static const unsigned char temp_binary_data_11[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -666,10 +1897,10 @@ static const unsigned char temp_binary_data_7[] = "\r\n" "#endif // %%headerGuard%%\r\n"; -const char* jucer_ComponentTemplate_h = (const char*) temp_binary_data_7; +const char* jucer_ComponentTemplate_h = (const char*) temp_binary_data_11; //================== jucer_ContentCompTemplate.cpp ================== -static const unsigned char temp_binary_data_8[] = +static const unsigned char temp_binary_data_12[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -707,10 +1938,10 @@ static const unsigned char temp_binary_data_8[] = " // update their positions.\r\n" "}\r\n"; -const char* jucer_ContentCompTemplate_cpp = (const char*) temp_binary_data_8; +const char* jucer_ContentCompTemplate_cpp = (const char*) temp_binary_data_12; //================== jucer_ContentCompTemplate.h ================== -static const unsigned char temp_binary_data_9[] = +static const unsigned char temp_binary_data_13[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -748,10 +1979,10 @@ static const unsigned char temp_binary_data_9[] = "\r\n" "#endif // HEADERGUARD\r\n"; -const char* jucer_ContentCompTemplate_h = (const char*) temp_binary_data_9; +const char* jucer_ContentCompTemplate_h = (const char*) temp_binary_data_13; //================== jucer_InlineComponentTemplate.h ================== -static const unsigned char temp_binary_data_10[] = +static const unsigned char temp_binary_data_14[] = "//==============================================================================\r\n" "class COMPONENTCLASS : public Component\r\n" "{\r\n" @@ -793,10 +2024,10 @@ static const unsigned char temp_binary_data_10[] = " JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (COMPONENTCLASS)\r\n" "};\r\n"; -const char* jucer_InlineComponentTemplate_h = (const char*) temp_binary_data_10; +const char* jucer_InlineComponentTemplate_h = (const char*) temp_binary_data_14; //================== jucer_MainConsoleAppTemplate.cpp ================== -static const unsigned char temp_binary_data_11[] = +static const unsigned char temp_binary_data_15[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -820,10 +2051,10 @@ static const unsigned char temp_binary_data_11[] = " return 0;\r\n" "}\r\n"; -const char* jucer_MainConsoleAppTemplate_cpp = (const char*) temp_binary_data_11; +const char* jucer_MainConsoleAppTemplate_cpp = (const char*) temp_binary_data_15; //================== jucer_MainTemplate_NoWindow.cpp ================== -static const unsigned char temp_binary_data_12[] = +static const unsigned char temp_binary_data_16[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -879,10 +2110,10 @@ static const unsigned char temp_binary_data_12[] = "// This macro generates the main() routine that launches the app.\r\n" "START_JUCE_APPLICATION (APPCLASSNAME)\r\n"; -const char* jucer_MainTemplate_NoWindow_cpp = (const char*) temp_binary_data_12; +const char* jucer_MainTemplate_NoWindow_cpp = (const char*) temp_binary_data_16; //================== jucer_MainTemplate_SimpleWindow.cpp ================== -static const unsigned char temp_binary_data_13[] = +static const unsigned char temp_binary_data_17[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -985,10 +2216,10 @@ static const unsigned char temp_binary_data_13[] = "// This macro generates the main() routine that launches the app.\r\n" "START_JUCE_APPLICATION (APPCLASSNAME)\r\n"; -const char* jucer_MainTemplate_SimpleWindow_cpp = (const char*) temp_binary_data_13; +const char* jucer_MainTemplate_SimpleWindow_cpp = (const char*) temp_binary_data_17; //================== jucer_MainTemplate_Window.cpp ================== -static const unsigned char temp_binary_data_14[] = +static const unsigned char temp_binary_data_18[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -1089,10 +2320,10 @@ static const unsigned char temp_binary_data_14[] = "// This macro generates the main() routine that launches the app.\r\n" "START_JUCE_APPLICATION (APPCLASSNAME)\r\n"; -const char* jucer_MainTemplate_Window_cpp = (const char*) temp_binary_data_14; +const char* jucer_MainTemplate_Window_cpp = (const char*) temp_binary_data_18; //================== jucer_NewComponentTemplate.cpp ================== -static const unsigned char temp_binary_data_15[] = +static const unsigned char temp_binary_data_19[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -1145,10 +2376,10 @@ static const unsigned char temp_binary_data_15[] = "\r\n" "}\r\n"; -const char* jucer_NewComponentTemplate_cpp = (const char*) temp_binary_data_15; +const char* jucer_NewComponentTemplate_cpp = (const char*) temp_binary_data_19; //================== jucer_NewComponentTemplate.h ================== -static const unsigned char temp_binary_data_16[] = +static const unsigned char temp_binary_data_20[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -1183,10 +2414,10 @@ static const unsigned char temp_binary_data_16[] = "\r\n" "#endif // HEADERGUARD\r\n"; -const char* jucer_NewComponentTemplate_h = (const char*) temp_binary_data_16; +const char* jucer_NewComponentTemplate_h = (const char*) temp_binary_data_20; //================== jucer_NewCppFileTemplate.cpp ================== -static const unsigned char temp_binary_data_17[] = +static const unsigned char temp_binary_data_21[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -1199,10 +2430,10 @@ static const unsigned char temp_binary_data_17[] = "\r\n" "INCLUDE_CORRESPONDING_HEADER\r\n"; -const char* jucer_NewCppFileTemplate_cpp = (const char*) temp_binary_data_17; +const char* jucer_NewCppFileTemplate_cpp = (const char*) temp_binary_data_21; //================== jucer_NewCppFileTemplate.h ================== -static const unsigned char temp_binary_data_18[] = +static const unsigned char temp_binary_data_22[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -1222,10 +2453,10 @@ static const unsigned char temp_binary_data_18[] = "\r\n" "#endif // HEADERGUARD\r\n"; -const char* jucer_NewCppFileTemplate_h = (const char*) temp_binary_data_18; +const char* jucer_NewCppFileTemplate_h = (const char*) temp_binary_data_22; //================== jucer_NewInlineComponentTemplate.h ================== -static const unsigned char temp_binary_data_19[] = +static const unsigned char temp_binary_data_23[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -1292,10 +2523,10 @@ static const unsigned char temp_binary_data_19[] = "\r\n" "#endif // HEADERGUARD\r\n"; -const char* jucer_NewInlineComponentTemplate_h = (const char*) temp_binary_data_19; +const char* jucer_NewInlineComponentTemplate_h = (const char*) temp_binary_data_23; //================== jucer_OpenGLComponentTemplate.cpp ================== -static const unsigned char temp_binary_data_20[] = +static const unsigned char temp_binary_data_24[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" @@ -1373,10 +2604,10 @@ static const unsigned char temp_binary_data_20[] = "\r\n" "#endif // MAINCOMPONENT_H_INCLUDED\r\n"; -const char* jucer_OpenGLComponentTemplate_cpp = (const char*) temp_binary_data_20; +const char* jucer_OpenGLComponentTemplate_cpp = (const char*) temp_binary_data_24; //================== background_logo.svg ================== -static const unsigned char temp_binary_data_21[] = +static const unsigned char temp_binary_data_25[] = "\r\n" "\r\n"; -const char* background_logo_svg = (const char*) temp_binary_data_21; +const char* background_logo_svg = (const char*) temp_binary_data_25; //================== background_tile.png ================== -static const unsigned char temp_binary_data_22[] = +static const unsigned char temp_binary_data_26[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,7,0,0,0,7,8,6,0,0,0,196,82,87,211,0,0,0,94,73,68,65,84,120,218,85,141,73,14,0,33,8,4,253,137,226,18,19,245,234,255,127,70,75,155,232,56,135,10,132,94,112,33,4,37,222,123,205,57,107,74,105,239,196,137, 8,72,239,29,99,12,204,57,209,90,227,237,19,45,113,161,209,12,234,172,18,49,70,88,229,134,34,103,173,245,159,60,134,82,10,238,79,166,223,106,238,91,100,229,73,191,80,92,47,179,68,223,148,158,98,226,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; -const char* background_tile_png = (const char*) temp_binary_data_22; +const char* background_tile_png = (const char*) temp_binary_data_26; //================== colourscheme_dark.xml ================== -static const unsigned char temp_binary_data_23[] = +static const unsigned char temp_binary_data_27[] = "\r\n" "\r\n" "\r\n" @@ -1450,10 +2681,10 @@ static const unsigned char temp_binary_data_23[] = " \r\n" "\r\n"; -const char* colourscheme_dark_xml = (const char*) temp_binary_data_23; +const char* colourscheme_dark_xml = (const char*) temp_binary_data_27; //================== colourscheme_light.xml ================== -static const unsigned char temp_binary_data_24[] = +static const unsigned char temp_binary_data_28[] = "\r\n" "\r\n" "\r\n" @@ -1478,10 +2709,10 @@ static const unsigned char temp_binary_data_24[] = " \r\n" "\r\n"; -const char* colourscheme_light_xml = (const char*) temp_binary_data_24; +const char* colourscheme_light_xml = (const char*) temp_binary_data_28; //================== juce_icon.png ================== -static const unsigned char temp_binary_data_25[] = +static const unsigned char temp_binary_data_29[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,2,0,0,0,2,0,8,6,0,0,0,244,120,212,250,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,0,0,3,40,105,84,88,116,88,77,76,58, 99,111,109,46,97,100,111,98,101,46,120,109,112,0,0,0,0,0,60,63,120,112,97,99,107,101,116,32,98,101,103,105,110,61,34,239,187,191,34,32,105,100,61,34,87,53,77,48,77,112,67,101,104,105,72,122,114,101,83,122,78,84,99,122,107,99,57,100,34,63,62,32,60,120, 58,120,109,112,109,101,116,97,32,120,109,108,110,115,58,120,61,34,97,100,111,98,101,58,110,115,58,109,101,116,97,47,34,32,120,58,120,109,112,116,107,61,34,65,100,111,98,101,32,88,77,80,32,67,111,114,101,32,53,46,54,45,99,48,54,55,32,55,57,46,49,53,55, @@ -2127,10 +3358,10 @@ static const unsigned char temp_binary_data_25[] = 0,0,0,2,0,0,16,0,0,128,0,0,0,4,0,0,32,0,0,0,1,0,0,8,0,0,64,0,0,0,2,0,0,16,0,0,128,0,0,0,4,0,0,32,0,0,0,1,0,0,8,0,0,64,0,0,128,0,0,0,4,0,0,32,0,0,0,1,0,0,8,0,0,64,0,0,0,2,0,0,16,0,0,128,0,0,0,4,0,0,32,0,0,128,191,246,33,192,0,100,235,173,153,70,62,64, 37,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; -const char* juce_icon_png = (const char*) temp_binary_data_25; +const char* juce_icon_png = (const char*) temp_binary_data_29; //================== projectIconAndroid.png ================== -static const unsigned char temp_binary_data_26[] = +static const unsigned char temp_binary_data_30[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,128,0,0,0,128,8,6,0,0,0,195,62,97,203,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,0,0,3,134,105,84,88,116,88,77,76, 58,99,111,109,46,97,100,111,98,101,46,120,109,112,0,0,0,0,0,60,63,120,112,97,99,107,101,116,32,98,101,103,105,110,61,34,239,187,191,34,32,105,100,61,34,87,53,77,48,77,112,67,101,104,105,72,122,114,101,83,122,78,84,99,122,107,99,57,100,34,63,62,32,60, 120,58,120,109,112,109,101,116,97,32,120,109,108,110,115,58,120,61,34,97,100,111,98,101,58,110,115,58,109,101,116,97,47,34,32,120,58,120,109,112,116,107,61,34,65,100,111,98,101,32,88,77,80,32,67,111,114,101,32,53,46,54,45,99,48,49,52,32,55,57,46,49,53, @@ -2247,10 +3478,10 @@ static const unsigned char temp_binary_data_26[] = 139,240,165,4,64,57,166,132,157,54,246,220,165,230,39,27,156,211,4,232,176,247,44,193,125,203,174,137,229,132,198,114,231,150,74,124,238,9,19,9,244,154,7,0,175,121,0,240,154,7,0,175,121,0,240,154,7,0,175,121,0,240,154,7,0,175,189,235,246,255,2,12,0,158, 137,39,54,252,6,9,64,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; -const char* projectIconAndroid_png = (const char*) temp_binary_data_26; +const char* projectIconAndroid_png = (const char*) temp_binary_data_30; //================== projectIconCodeblocks.png ================== -static const unsigned char temp_binary_data_27[] = +static const unsigned char temp_binary_data_31[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,128,0,0,0,128,8,6,0,0,0,195,62,97,203,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,0,0,3,134,105,84,88,116,88,77,76, 58,99,111,109,46,97,100,111,98,101,46,120,109,112,0,0,0,0,0,60,63,120,112,97,99,107,101,116,32,98,101,103,105,110,61,34,239,187,191,34,32,105,100,61,34,87,53,77,48,77,112,67,101,104,105,72,122,114,101,83,122,78,84,99,122,107,99,57,100,34,63,62,32,60, 120,58,120,109,112,109,101,116,97,32,120,109,108,110,115,58,120,61,34,97,100,111,98,101,58,110,115,58,109,101,116,97,47,34,32,120,58,120,109,112,116,107,61,34,65,100,111,98,101,32,88,77,80,32,67,111,114,101,32,53,46,54,45,99,48,49,52,32,55,57,46,49,53, @@ -2420,10 +3651,10 @@ static const unsigned char temp_binary_data_27[] = 202,84,15,91,2,120,13,161,41,237,191,111,130,252,4,17,176,224,208,111,140,253,56,221,147,207,16,11,238,233,234,37,192,250,248,241,59,248,122,10,214,12,176,62,214,12,176,62,214,12,176,62,214,12,176,62,214,12,176,62,214,12,176,62,214,12,176,62,214,12,176, 62,214,12,176,62,214,12,176,62,214,12,176,62,214,12,176,62,214,12,176,62,214,12,176,62,126,28,143,255,39,192,0,238,147,31,89,162,25,31,21,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; -const char* projectIconCodeblocks_png = (const char*) temp_binary_data_27; +const char* projectIconCodeblocks_png = (const char*) temp_binary_data_31; //================== projectIconLinuxMakefile.png ================== -static const unsigned char temp_binary_data_28[] = +static const unsigned char temp_binary_data_32[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,110,0,0,0,128,8,6,0,0,0,234,21,92,9,0,0,10,65,105,67,67,80,73,67,67,32,80,114,111,102,105,108,101,0,0,72,13,157,150,119,84,83,217,22,135,207,189,55,189,208,18,34,32,37,244,26,122,9,32,210,59,72,21,4, 81,137,73,128,80,2,134,132,38,118,68,5,70,20,17,41,86,100,84,192,1,71,135,34,99,69,20,11,131,130,98,215,9,242,16,80,198,193,81,68,69,229,221,140,107,9,239,173,53,243,222,154,253,199,89,223,217,231,183,215,217,103,239,125,215,186,0,80,252,130,4,194,116, 88,1,128,52,161,88,20,238,235,193,92,18,19,203,196,247,2,24,16,1,14,88,1,192,225,102,102,4,71,248,68,2,212,252,189,61,153,153,168,72,198,179,246,238,46,128,100,187,219,44,191,80,38,115,214,255,127,145,34,55,67,36,6,0,10,69,213,54,60,126,38,23,229,2,148, @@ -2659,10 +3890,10 @@ static const unsigned char temp_binary_data_28[] = 194,72,142,254,249,31,79,111,60,173,241,241,124,82,34,189,246,233,251,163,179,223,129,178,15,181,97,103,68,217,251,253,17,198,63,35,254,218,150,109,129,235,236,183,141,63,16,97,60,125,157,93,199,211,219,217,245,128,211,250,223,12,238,70,210,82,169,25, 10,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; -const char* projectIconLinuxMakefile_png = (const char*) temp_binary_data_28; +const char* projectIconLinuxMakefile_png = (const char*) temp_binary_data_32; //================== projectIconVisualStudio.png ================== -static const unsigned char temp_binary_data_29[] = +static const unsigned char temp_binary_data_33[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,128,0,0,0,128,8,6,0,0,0,195,62,97,203,0,0,0,1,115,82,71,66,0,174,206,28,233,0,0,4,166,105,84,88,116,88,77,76,58,99,111,109,46,97,100,111,98,101,46,120,109,112,0,0,0,0,0,60,120,58,120,109,112,109,101, 116,97,32,120,109,108,110,115,58,120,61,34,97,100,111,98,101,58,110,115,58,109,101,116,97,47,34,32,120,58,120,109,112,116,107,61,34,88,77,80,32,67,111,114,101,32,53,46,52,46,48,34,62,10,32,32,32,60,114,100,102,58,82,68,70,32,120,109,108,110,115,58,114, 100,102,61,34,104,116,116,112,58,47,47,119,119,119,46,119,51,46,111,114,103,47,49,57,57,57,47,48,50,47,50,50,45,114,100,102,45,115,121,110,116,97,120,45,110,115,35,34,62,10,32,32,32,32,32,32,60,114,100,102,58,68,101,115,99,114,105,112,116,105,111,110, @@ -2765,10 +3996,10 @@ static const unsigned char temp_binary_data_29[] = 60,9,167,156,184,49,164,154,223,25,2,227,183,193,73,245,49,24,79,213,175,147,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,128,166,192,129,64, 129,255,7,47,12,150,8,60,209,161,194,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; -const char* projectIconVisualStudio_png = (const char*) temp_binary_data_29; +const char* projectIconVisualStudio_png = (const char*) temp_binary_data_33; //================== projectIconXcode.png ================== -static const unsigned char temp_binary_data_30[] = +static const unsigned char temp_binary_data_34[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,128,0,0,0,128,8,6,0,0,0,195,62,97,203,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,0,0,3,40,105,84,88,116,88,77,76,58, 99,111,109,46,97,100,111,98,101,46,120,109,112,0,0,0,0,0,60,63,120,112,97,99,107,101,116,32,98,101,103,105,110,61,34,239,187,191,34,32,105,100,61,34,87,53,77,48,77,112,67,101,104,105,72,122,114,101,83,122,78,84,99,122,107,99,57,100,34,63,62,32,60,120, 58,120,109,112,109,101,116,97,32,120,109,108,110,115,58,120,61,34,97,100,111,98,101,58,110,115,58,109,101,116,97,47,34,32,120,58,120,109,112,116,107,61,34,65,100,111,98,101,32,88,77,80,32,67,111,114,101,32,53,46,54,45,99,48,49,52,32,55,57,46,49,53,54, @@ -3028,10 +4259,10 @@ static const unsigned char temp_binary_data_30[] = 94,156,0,232,23,120,134,102,179,249,235,17,128,9,19,38,192,59,223,249,206,152,182,172,169,75,67,169,119,178,110,237,223,246,242,196,143,188,48,28,50,88,157,63,127,254,175,124,82,161,71,186,231,200,203,63,99,234,231,229,216,252,127,248,207,255,19,96,0, 221,83,18,25,240,8,112,38,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; -const char* projectIconXcode_png = (const char*) temp_binary_data_30; +const char* projectIconXcode_png = (const char*) temp_binary_data_34; //================== projectIconXcodeIOS.png ================== -static const unsigned char temp_binary_data_31[] = +static const unsigned char temp_binary_data_35[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,128,0,0,0,128,8,6,0,0,0,195,62,97,203,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,0,0,3,134,105,84,88,116,88,77,76, 58,99,111,109,46,97,100,111,98,101,46,120,109,112,0,0,0,0,0,60,63,120,112,97,99,107,101,116,32,98,101,103,105,110,61,34,239,187,191,34,32,105,100,61,34,87,53,77,48,77,112,67,101,104,105,72,122,114,101,83,122,78,84,99,122,107,99,57,100,34,63,62,32,60, 120,58,120,109,112,109,101,116,97,32,120,109,108,110,115,58,120,61,34,97,100,111,98,101,58,110,115,58,109,101,116,97,47,34,32,120,58,120,109,112,116,107,61,34,65,100,111,98,101,32,88,77,80,32,67,111,114,101,32,53,46,54,45,99,48,49,52,32,55,57,46,49,53, @@ -3289,10 +4520,10 @@ static const unsigned char temp_binary_data_31[] = 4,97,9,162,191,203,0,199,198,0,162,157,87,213,105,220,35,12,64,131,146,62,249,201,79,186,117,103,130,86,133,76,84,14,16,185,67,123,223,37,252,241,103,134,146,206,234,228,201,147,143,250,164,172,171,29,174,239,254,252,101,253,188,235,155,255,31,255,249, 255,2,12,0,235,154,52,248,249,240,115,28,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; -const char* projectIconXcodeIOS_png = (const char*) temp_binary_data_31; +const char* projectIconXcodeIOS_png = (const char*) temp_binary_data_35; //================== projucer_EULA.txt ================== -static const unsigned char temp_binary_data_32[] = +static const unsigned char temp_binary_data_36[] = "\r\n" "IMPORTANT NOTICE: PLEASE READ CAREFULLY BEFORE INSTALLING THE SOFTWARE:\r\n" "\r\n" @@ -3438,7 +4669,7 @@ static const unsigned char temp_binary_data_32[] = "9. Data\r\n" "\r\n" "9.1. We may collect and process information about your use of or Software through the Software, some of which may amount to your personal data. Personal data will be collected and processed in accordance with our Privacy Policy which can be reviewed " -"at [INSERT LINK TO PRIVACY POLICY]. \r\n" +"at https://www.juce.com/privacy-policy. \r\n" "\r\n" "10. Other important terms\r\n" "\r\n" @@ -3456,10 +4687,10 @@ static const unsigned char temp_binary_data_32[] = "\r\n" "10.6. Please note that this Licence, its subject matter and its formation, are governed by English law. You and we both agree to that the courts of England and Wales will have exclusive jurisdiction. \r\n"; -const char* projucer_EULA_txt = (const char*) temp_binary_data_32; +const char* projucer_EULA_txt = (const char*) temp_binary_data_36; //================== projucer_login_bg.svg ================== -static const unsigned char temp_binary_data_33[] = +static const unsigned char temp_binary_data_37[] = "\r\n" "\r\n" "\r\n" "\r\n"; -const char* projucer_login_bg_svg = (const char*) temp_binary_data_33; +const char* projucer_login_bg_svg = (const char*) temp_binary_data_37; //================== RecentFilesMenuTemplate.nib ================== -static const unsigned char temp_binary_data_34[] = +static const unsigned char temp_binary_data_38[] = { 98,112,108,105,115,116,48,48,212,0,1,0,2,0,3,0,4,0,5,0,6,1,53,1,54,88,36,118,101,114,115,105,111,110,88,36,111,98,106,101,99,116,115,89,36,97,114,99,104,105,118,101,114,84,36,116,111,112,18,0,1,134,160,175,16,74,0,7,0,8,0,31,0,35,0,36,0,42,0,46,0,50, 0,53,0,57,0,74,0,77,0,78,0,86,0,87,0,97,0,112,0,113,0,114,0,119,0,120,0,121,0,124,0,128,0,129,0,132,0,143,0,144,0,145,0,149,0,153,0,162,0,163,0,164,0,169,0,173,0,180,0,181,0,182,0,185,0,192,0,193,0,200,0,201,0,208,0,209,0,216,0,217,0,224,0,225,0,226, 0,229,0,230,0,232,0,249,1,11,1,29,1,30,1,31,1,32,1,33,1,34,1,35,1,36,1,37,1,38,1,39,1,40,1,41,1,42,1,43,1,44,1,47,1,50,85,36,110,117,108,108,219,0,9,0,10,0,11,0,12,0,13,0,14,0,15,0,16,0,17,0,18,0,19,0,20,0,21,0,22,0,23,0,24,0,25,0,26,0,27,0,28,0,29,0, @@ -3563,10 +4794,10 @@ static const unsigned char temp_binary_data_34[] = 7,157,7,159,7,161,7,163,7,165,7,167,7,169,7,171,7,173,7,175,7,177,7,179,7,181,7,190,7,192,7,225,7,227,7,229,7,231,7,233,7,235,7,237,7,239,7,241,7,243,7,245,7,247,7,249,7,251,7,253,7,255,8,2,8,5,8,8,8,11,8,14,8,17,8,20,8,23,8,26,8,29,8,32,8,35,8,38,8, 41,8,44,8,53,8,55,8,56,8,65,8,67,8,68,8,77,8,92,8,97,8,115,8,120,8,134,0,0,0,0,0,0,2,2,0,0,0,0,0,0,1,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,136,0,0 }; -const char* RecentFilesMenuTemplate_nib = (const char*) temp_binary_data_34; +const char* RecentFilesMenuTemplate_nib = (const char*) temp_binary_data_38; //================== wizard_AnimatedApp.svg ================== -static const unsigned char temp_binary_data_35[] = +static const unsigned char temp_binary_data_39[] = "\r\n" "\r\n" "\r\n" @@ -3613,10 +4844,10 @@ static const unsigned char temp_binary_data_35[] = "\r\n" "\r\n"; -const char* wizard_AnimatedApp_svg = (const char*) temp_binary_data_35; +const char* wizard_AnimatedApp_svg = (const char*) temp_binary_data_39; //================== wizard_AudioApp.svg ================== -static const unsigned char temp_binary_data_36[] = +static const unsigned char temp_binary_data_40[] = "\r\n" "\r\n" "\r\n" @@ -3690,10 +4921,10 @@ static const unsigned char temp_binary_data_36[] = "\r\n" "\r\n"; -const char* wizard_AudioApp_svg = (const char*) temp_binary_data_36; +const char* wizard_AudioApp_svg = (const char*) temp_binary_data_40; //================== wizard_AudioPlugin.svg ================== -static const unsigned char temp_binary_data_37[] = +static const unsigned char temp_binary_data_41[] = "\r\n" "\r\n" "\r\n" @@ -3804,10 +5035,10 @@ static const unsigned char temp_binary_data_37[] = "\r\n" "\r\n"; -const char* wizard_AudioPlugin_svg = (const char*) temp_binary_data_37; +const char* wizard_AudioPlugin_svg = (const char*) temp_binary_data_41; //================== wizard_ConsoleApp.svg ================== -static const unsigned char temp_binary_data_38[] = +static const unsigned char temp_binary_data_42[] = "\r\n" "\r\n" "\r\n" @@ -3830,10 +5061,10 @@ static const unsigned char temp_binary_data_38[] = "\r\n" "\r\n"; -const char* wizard_ConsoleApp_svg = (const char*) temp_binary_data_38; +const char* wizard_ConsoleApp_svg = (const char*) temp_binary_data_42; //================== wizard_DLL.svg ================== -static const unsigned char temp_binary_data_39[] = +static const unsigned char temp_binary_data_43[] = "\r\n" "\r\n" "\r\n" @@ -3876,10 +5107,10 @@ static const unsigned char temp_binary_data_39[] = "\tl-7.7,5.3c-0.7,0.5-1.7,0.3-2.2-0.4L70.1,31\"/>\r\n" "\r\n"; -const char* wizard_DLL_svg = (const char*) temp_binary_data_39; +const char* wizard_DLL_svg = (const char*) temp_binary_data_43; //================== wizard_GUI.svg ================== -static const unsigned char temp_binary_data_40[] = +static const unsigned char temp_binary_data_44[] = "\r\n" "\r\n" "\r\n" @@ -3930,10 +5161,10 @@ static const unsigned char temp_binary_data_40[] = "\tC0,3.1,3.1,0,6.9,0H130c3.8,0,6.9,3.1,6.9,6.9v101.1C136.9,111.7,133.9,114.8,130,114.8z\"/>\r\n" "\r\n"; -const char* wizard_GUI_svg = (const char*) temp_binary_data_40; +const char* wizard_GUI_svg = (const char*) temp_binary_data_44; //================== wizard_Highlight.svg ================== -static const unsigned char temp_binary_data_41[] = +static const unsigned char temp_binary_data_45[] = "\r\n" "\r\n" "\r\n" @@ -3943,10 +5174,10 @@ static const unsigned char temp_binary_data_41[] = "\tV108C136.9,111.8,133.9,114.8,130.1,114.8z\"/>\r\n" "\r\n"; -const char* wizard_Highlight_svg = (const char*) temp_binary_data_41; +const char* wizard_Highlight_svg = (const char*) temp_binary_data_45; //================== wizard_Openfile.svg ================== -static const unsigned char temp_binary_data_42[] = +static const unsigned char temp_binary_data_46[] = "\r\n" "\r\n" "\r\n" @@ -3956,10 +5187,10 @@ static const unsigned char temp_binary_data_42[] = "\tc0-3.8,3.1-6.9,6.9-6.9h151.5c3.8,0,6.9,3.1,6.9,6.9v20.9C171.6,68.3,168.5,71.4,164.7,71.4z\"/>\r\n" "\r\n"; -const char* wizard_Openfile_svg = (const char*) temp_binary_data_42; +const char* wizard_Openfile_svg = (const char*) temp_binary_data_46; //================== wizard_OpenGL.svg ================== -static const unsigned char temp_binary_data_43[] = +static const unsigned char temp_binary_data_47[] = "\r\n" "\r\n" "\r\n" @@ -3987,10 +5218,10 @@ static const unsigned char temp_binary_data_43[] = "\ts-13.4-19.6-6.9-30\"/>\r\n" "\r\n"; -const char* wizard_OpenGL_svg = (const char*) temp_binary_data_43; +const char* wizard_OpenGL_svg = (const char*) temp_binary_data_47; //================== wizard_StaticLibrary.svg ================== -static const unsigned char temp_binary_data_44[] = +static const unsigned char temp_binary_data_48[] = "\r\n" "\r\n" "\r\n" @@ -4033,7 +5264,7 @@ static const unsigned char temp_binary_data_44[] = "\tc-1,0-1.8-0.8-1.8-1.8V20.8\"/>\r\n" "\r\n"; -const char* wizard_StaticLibrary_svg = (const char*) temp_binary_data_44; +const char* wizard_StaticLibrary_svg = (const char*) temp_binary_data_48; const char* getNamedResource (const char*, int&) throw(); @@ -4046,12 +5277,16 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw switch (hash) { + case 0x4d6bedc8: numBytes = 53636; return gradlewrapper_jar; + case 0x10b04d10: numBytes = 4971; return gradlew; + case 0x76cff066: numBytes = 2404; return gradlew_bat; + case 0x34bc1021: numBytes = 11325; return LICENSE; case 0x6cf2645e: numBytes = 1949; return jucer_AnimatedComponentTemplate_cpp; case 0xafccbd3f: numBytes = 3203; return jucer_AudioComponentTemplate_cpp; case 0x27c5a93a: numBytes = 1162; return jucer_AudioPluginEditorTemplate_cpp; case 0x4d0721bf: numBytes = 994; return jucer_AudioPluginEditorTemplate_h; - case 0x51b49ac5: numBytes = 5047; return jucer_AudioPluginFilterTemplate_cpp; - case 0x488afa0a: numBytes = 2289; return jucer_AudioPluginFilterTemplate_h; + case 0x51b49ac5: numBytes = 5475; return jucer_AudioPluginFilterTemplate_cpp; + case 0x488afa0a: numBytes = 2259; return jucer_AudioPluginFilterTemplate_h; case 0xabad7041: numBytes = 2151; return jucer_ComponentTemplate_cpp; case 0xfc72fe86: numBytes = 2131; return jucer_ComponentTemplate_h; case 0x0b66646c: numBytes = 886; return jucer_ContentCompTemplate_cpp; @@ -4078,7 +5313,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw case 0x20236af2: numBytes = 7194; return projectIconVisualStudio_png; case 0xecc12a3d: numBytes = 18281; return projectIconXcode_png; case 0x9d3ae124: numBytes = 18111; return projectIconXcodeIOS_png; - case 0xd6bb7d1d: numBytes = 14390; return projucer_EULA_txt; + case 0xd6bb7d1d: numBytes = 14394; return projucer_EULA_txt; case 0xb7422947: numBytes = 5046; return projucer_login_bg_svg; case 0xa41e649d: numBytes = 2842; return RecentFilesMenuTemplate_nib; case 0x1f3b6d2f: numBytes = 2963; return wizard_AnimatedApp_svg; @@ -4100,6 +5335,10 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw const char* namedResourceList[] = { + "gradlewrapper_jar", + "gradlew", + "gradlew_bat", + "LICENSE", "jucer_AnimatedComponentTemplate_cpp", "jucer_AudioComponentTemplate_cpp", "jucer_AudioPluginEditorTemplate_cpp", diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.h b/extras/Projucer/JuceLibraryCode/BinaryData.h index 40ebaf99..7db96df7 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.h +++ b/extras/Projucer/JuceLibraryCode/BinaryData.h @@ -9,6 +9,18 @@ namespace BinaryData { + extern const char* gradlewrapper_jar; + const int gradlewrapper_jarSize = 53636; + + extern const char* gradlew; + const int gradlewSize = 4971; + + extern const char* gradlew_bat; + const int gradlew_batSize = 2404; + + extern const char* LICENSE; + const int LICENSESize = 11325; + extern const char* jucer_AnimatedComponentTemplate_cpp; const int jucer_AnimatedComponentTemplate_cppSize = 1949; @@ -22,10 +34,10 @@ namespace BinaryData const int jucer_AudioPluginEditorTemplate_hSize = 994; extern const char* jucer_AudioPluginFilterTemplate_cpp; - const int jucer_AudioPluginFilterTemplate_cppSize = 5047; + const int jucer_AudioPluginFilterTemplate_cppSize = 5475; extern const char* jucer_AudioPluginFilterTemplate_h; - const int jucer_AudioPluginFilterTemplate_hSize = 2289; + const int jucer_AudioPluginFilterTemplate_hSize = 2259; extern const char* jucer_ComponentTemplate_cpp; const int jucer_ComponentTemplate_cppSize = 2151; @@ -106,7 +118,7 @@ namespace BinaryData const int projectIconXcodeIOS_pngSize = 18111; extern const char* projucer_EULA_txt; - const int projucer_EULA_txtSize = 14390; + const int projucer_EULA_txtSize = 14394; extern const char* projucer_login_bg_svg; const int projucer_login_bg_svgSize = 5046; @@ -148,7 +160,7 @@ namespace BinaryData extern const char* namedResourceList[]; // Number of elements in the namedResourceList array. - const int namedResourceListSize = 45; + const int namedResourceListSize = 49; // If you provide the name of one of the binary resource variables above, this function will // return the corresponding data and its size (or a null pointer if the name isn't found). diff --git a/extras/Projucer/JuceLibraryCode/JuceHeader.h b/extras/Projucer/JuceLibraryCode/JuceHeader.h index e65f304f..7bce745e 100644 --- a/extras/Projucer/JuceLibraryCode/JuceHeader.h +++ b/extras/Projucer/JuceLibraryCode/JuceHeader.h @@ -35,8 +35,8 @@ namespace ProjectInfo { const char* const projectName = "Projucer"; - const char* const versionString = "4.2.4"; - const int versionNumber = 0x40204; + const char* const versionString = "4.3.0"; + const int versionNumber = 0x40300; } #endif diff --git a/extras/Projucer/Projucer.jucer b/extras/Projucer/Projucer.jucer index 672aed62..c13a1985 100644 --- a/extras/Projucer/Projucer.jucer +++ b/extras/Projucer/Projucer.jucer @@ -1,7 +1,7 @@ + + - - @@ -517,6 +521,13 @@ resource="0" file="Source/Wizards/jucer_TemplateThumbnailsComponent.h"/> + + + + + + diff --git a/extras/Projucer/Source/Application/jucer_Application.cpp b/extras/Projucer/Source/Application/jucer_Application.cpp index efa3d3dc..bc909c17 100644 --- a/extras/Projucer/Source/Application/jucer_Application.cpp +++ b/extras/Projucer/Source/Application/jucer_Application.cpp @@ -154,7 +154,12 @@ void ProjucerApplication::handleAsyncUpdate() initialiseWindows (getCommandLineParameters()); #if JUCE_MAC - MenuBarModel::setMacMainMenu (menuModel, nullptr, "Open Recent"); + PopupMenu extraAppleMenuItems; + createExtraAppleMenuItems (extraAppleMenuItems); + + // workaround broken "Open Recent" submenu: not passing the + // submenu's title here avoids the defect in JuceMainMenuHandler::addMenuItem + MenuBarModel::setMacMainMenu (menuModel, &extraAppleMenuItems); //, "Open Recent"); #endif versionChecker = new LatestVersionChecker(); @@ -331,8 +336,11 @@ void ProjucerApplication::createFileMenu (PopupMenu& menu) menu.addSeparator(); menu.addCommandItem (commandManager, CommandIDs::openInIDE); menu.addCommandItem (commandManager, CommandIDs::saveAndOpenInIDE); + menu.addSeparator(); + menu.addCommandItem (commandManager, CommandIDs::loginLogout); #if ! JUCE_MAC + menu.addCommandItem (commandManager, CommandIDs::showGlobalPreferences); menu.addSeparator(); menu.addCommandItem (commandManager, StandardApplicationCommandIDs::quit); #endif @@ -424,13 +432,14 @@ void ProjucerApplication::createWindowMenu (PopupMenu& menu) void ProjucerApplication::createToolsMenu (PopupMenu& menu) { - menu.addCommandItem (commandManager, CommandIDs::showGlobalPreferences); - menu.addSeparator(); menu.addCommandItem (commandManager, CommandIDs::showUTF8Tool); menu.addCommandItem (commandManager, CommandIDs::showSVGPathTool); menu.addCommandItem (commandManager, CommandIDs::showTranslationTool); - menu.addSeparator(); - menu.addCommandItem (commandManager, CommandIDs::loginLogout); +} + +void ProjucerApplication::createExtraAppleMenuItems (PopupMenu& menu) +{ + menu.addCommandItem (commandManager, CommandIDs::showGlobalPreferences); } void ProjucerApplication::handleMainMenuCommand (int menuItemID) @@ -489,7 +498,8 @@ void ProjucerApplication::getCommandInfo (CommandID commandID, ApplicationComman break; case CommandIDs::showGlobalPreferences: - result.setInfo ("Global Preferences...", "Shows the global preferences window.", CommandCategories::general, 0); + result.setInfo ("Preferences...", "Shows the preferences window.", CommandCategories::general, 0); + result.defaultKeypresses.add (KeyPress (',', ModifierKeys::commandModifier, 0)); break; case CommandIDs::closeAllDocuments: diff --git a/extras/Projucer/Source/Application/jucer_Application.h b/extras/Projucer/Source/Application/jucer_Application.h index 66ca108d..36f4a3cf 100644 --- a/extras/Projucer/Source/Application/jucer_Application.h +++ b/extras/Projucer/Source/Application/jucer_Application.h @@ -73,6 +73,7 @@ public: void createColourSchemeItems (PopupMenu&); void createWindowMenu (PopupMenu&); void createToolsMenu (PopupMenu&); + void createExtraAppleMenuItems (PopupMenu&); void handleMainMenuCommand (int menuItemID); //============================================================================== diff --git a/extras/Projucer/Source/Application/jucer_DownloadCompileEngineThread.cpp b/extras/Projucer/Source/Application/jucer_DownloadCompileEngineThread.cpp new file mode 100644 index 00000000..d08327f3 --- /dev/null +++ b/extras/Projucer/Source/Application/jucer_DownloadCompileEngineThread.cpp @@ -0,0 +1,156 @@ +/* + ============================================================================== + + This file is part of the JUCE library. + Copyright (c) 2015 - ROLI Ltd. + + Permission is granted to use this software under the terms of either: + a) the GPL v2 (or any later version) + b) the Affero GPL v3 + + Details of these licenses can be found at: www.gnu.org/licenses + + JUCE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.juce.com for more information. + + ============================================================================== +*/ + +#include "../jucer_Headers.h" +#include "jucer_DownloadCompileEngineThread.h" +#include "../LiveBuildEngine/projucer_CompileEngineDLL.h" + +bool DownloadCompileEngineThread::downloadAndInstall() +{ + DownloadCompileEngineThread d; + + if (d.runThread()) + { + if (d.result.failed()) + return withError (d.result.getErrorMessage()); + + return true; + } + + if (d.cancelledByUser) + return false; + + return withError (d.result.getErrorMessage()); +} + +DownloadCompileEngineThread::DownloadCompileEngineThread() + : ThreadWithProgressWindow ("Downloading live-build engine", true, true), + result (Result::ok()), cancelledByUser (false) +{ +} + +void DownloadCompileEngineThread::threadComplete (bool userPressedCancel) +{ + cancelledByUser = userPressedCancel; +} + +void DownloadCompileEngineThread::run() +{ + setProgress (-1.0); + setStatusMessage ("Downloading..."); + + MemoryBlock zipData; + result = download (zipData); + + if (result.failed()) + return; + + setStatusMessage ("Installing..."); + + File installFolder = getInstallFolder(); + if (! installFolder.createDirectory()) + { + result = Result::fail ("Install error: cannot create target directory"); + return; + } + + result = install (zipData, installFolder); +} + +Result DownloadCompileEngineThread::download (MemoryBlock& dest) +{ + int statusCode = 302; + const int timeoutMs = 10000; + StringPairArray responseHeaders; + + URL url = getDownloadUrl(); + ScopedPointer in = url.createInputStream (false, nullptr, nullptr, + String(), timeoutMs, &responseHeaders, + &statusCode, 0); + + if (in == nullptr || statusCode != 200) + return Result::fail ("Download error: cannot establish connection"); + + MemoryOutputStream mo (dest, true); + + int64 size = in->getTotalLength(); + int64 bytesReceived = -1; + String msg("Downloading... (123)"); + + for (int64 pos = 0; pos < size; pos += bytesReceived) + { + setStatusMessage (msg.replace ("123", File::descriptionOfSizeInBytes (pos))); + + if (threadShouldExit()) + return Result::fail ("Download error: operation interrupted"); + + bytesReceived = mo.writeFromInputStream (*in, 8192); + + if (bytesReceived == 0) + return Result::fail ("Download error: lost connection"); + } + + return Result::ok(); +} + +Result DownloadCompileEngineThread::install (const MemoryBlock& data, File& targetFolder) +{ + MemoryInputStream input (data, false); + ZipFile zip (input); + + if (zip.getNumEntries() == 0) + return Result::fail ("Install error: downloaded file is corrupt"); + + if (threadShouldExit()) + return Result::fail ("Install error: operation interrupted"); + + return zip.uncompressTo (targetFolder); +} + +URL DownloadCompileEngineThread::getDownloadUrl() +{ + String urlStub ("http://assets.roli.com/juce/JUCECompileEngine_"); + + #if JUCE_MAC + urlStub << "osx_"; + #elif JUCE_WINDOWS + urlStub << "windows_"; + #else + jassertfalse; + #endif + + return urlStub + ProjectInfo::versionString + ".zip"; +} + +File DownloadCompileEngineThread::getInstallFolder() +{ + return CompileEngineDLL::getVersionedUserAppSupportFolder(); +} + +bool DownloadCompileEngineThread::withError(const String& msg) +{ + AlertWindow::showMessageBox (AlertWindow::WarningIcon, + "Download and install", msg); + return false; +} diff --git a/extras/Projucer/Source/Application/jucer_DownloadCompileEngineThread.h b/extras/Projucer/Source/Application/jucer_DownloadCompileEngineThread.h new file mode 100644 index 00000000..a1d5167a --- /dev/null +++ b/extras/Projucer/Source/Application/jucer_DownloadCompileEngineThread.h @@ -0,0 +1,57 @@ +/* + ============================================================================== + + This file is part of the JUCE library. + Copyright (c) 2015 - ROLI Ltd. + + Permission is granted to use this software under the terms of either: + a) the GPL v2 (or any later version) + b) the Affero GPL v3 + + Details of these licenses can be found at: www.gnu.org/licenses + + JUCE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.juce.com for more information. + + ============================================================================== +*/ + +#ifndef JUCER_DOWNLOADCOMPILEENGINETHREAD_H_INCLUDED +#define JUCER_DOWNLOADCOMPILEENGINETHREAD_H_INCLUDED + +#include "jucer_Application.h" + + +//============================================================================== +class DownloadCompileEngineThread : public ThreadWithProgressWindow +{ +public: + static bool downloadAndInstall(); + +protected: + void run() override; + void threadComplete (bool userPressedCancel) override; + +private: + DownloadCompileEngineThread(); + + Result download (MemoryBlock& dest); + Result install (const MemoryBlock& data, File& targetFolder); + + static URL getDownloadUrl(); + static File getInstallFolder(); + static bool withError(const String& msg); + + Result result; + bool cancelledByUser; + + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DownloadCompileEngineThread) +}; + +#endif // JUCER_DOWNLOADCOMPILEENGINETHREAD_H_INCLUDED diff --git a/extras/Projucer/Source/Application/jucer_GlobalPreferences.cpp b/extras/Projucer/Source/Application/jucer_GlobalPreferences.cpp index c113c598..7624506e 100644 --- a/extras/Projucer/Source/Application/jucer_GlobalPreferences.cpp +++ b/extras/Projucer/Source/Application/jucer_GlobalPreferences.cpp @@ -60,7 +60,7 @@ void PathSettingsTab::textPropertyComponentChanged (TextPropertyComponent* textP { Identifier keyName = getKeyForPropertyComponent (textPropertyComponent); - Colour textColour = getAppSettings().isGlobalPathValid (keyName, textPropertyComponent->getText()) + Colour textColour = getAppSettings().isGlobalPathValid (File::getCurrentWorkingDirectory(), keyName, textPropertyComponent->getText()) ? Colours::black : Colours::red; @@ -322,7 +322,7 @@ void AppearanceSettings::showGlobalPreferences (ScopedPointer& ownerP if (ownerPointer != nullptr) ownerPointer->toFront (true); else - new FloatingToolWindow ("Global Preferences", + new FloatingToolWindow ("Preferences", "globalPreferencesEditorPos", new GlobalPreferencesComponent, ownerPointer, diff --git a/extras/Projucer/Source/Application/jucer_LoginForm.h b/extras/Projucer/Source/Application/jucer_LoginForm.h index abde4df1..20d3963e 100644 --- a/extras/Projucer/Source/Application/jucer_LoginForm.h +++ b/extras/Projucer/Source/Application/jucer_LoginForm.h @@ -43,7 +43,7 @@ public: errorLabel ("Error Label", String()), rememberLoginCheckbox (TRANS("Remember login")), forgotPasswordButton (TRANS("Forgotten your password?"), - URL (getServerURL() + "reset_password?referer=projucer")), + URL ("https://auth.roli.com/forgot-password?referer=projucer")), rememberLogin (true) { setLookAndFeel (&lookAndFeel); @@ -286,6 +286,13 @@ private: { parentDialog->exitModalState (0); ProjucerApplication::getApp().updateAllBuildTabs(); + + if (ProjucerLicenses::getInstance()->hasFreeToUseLicense()) + { + AlertWindow::showMessageBoxAsync (AlertWindow::InfoIcon, + "Free to use license info", + "The free-to-use license expires on 31st January 2017 Midnight GMT"); + } } } diff --git a/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h b/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h index 8902433a..9435d241 100644 --- a/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h +++ b/extras/Projucer/Source/Application/jucer_ProjucerLicenses.h @@ -101,6 +101,17 @@ struct ProjucerLicenses : private DeletedAtShutdown return isDLLPresent() && dll.projucer_hasLiveCodingLicence(); } + bool hasFreeToUseLicense() const + { + return isDLLPresent() && dll.projucer_hasLicense ("ProjucerFreeToUse"); + } + + bool retryLoadDll() + { + dll.tryLoadDll(); + return dll.isLoaded(); + } + private: CompileEngineDLL dll; LoginCallback* userCallback = nullptr; diff --git a/extras/Projucer/Source/BinaryData/gradle/LICENSE b/extras/Projucer/Source/BinaryData/gradle/LICENSE new file mode 100644 index 00000000..e06d2081 --- /dev/null +++ b/extras/Projucer/Source/BinaryData/gradle/LICENSE @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/extras/Projucer/Source/BinaryData/gradle/gradle-wrapper.jar b/extras/Projucer/Source/BinaryData/gradle/gradle-wrapper.jar new file mode 100644 index 00000000..13372aef Binary files /dev/null and b/extras/Projucer/Source/BinaryData/gradle/gradle-wrapper.jar differ diff --git a/extras/Projucer/Source/BinaryData/gradle/gradlew b/extras/Projucer/Source/BinaryData/gradle/gradlew new file mode 100644 index 00000000..9d82f789 --- /dev/null +++ b/extras/Projucer/Source/BinaryData/gradle/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> $.*$$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/extras/Projucer/Source/BinaryData/gradle/gradlew.bat b/extras/Projucer/Source/BinaryData/gradle/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/extras/Projucer/Source/BinaryData/gradle/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp b/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp index e75add66..04345cfc 100644 --- a/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.cpp @@ -13,6 +13,16 @@ FILTERHEADERS //============================================================================== FILTERCLASSNAME::FILTERCLASSNAME() +#ifndef JucePlugin_PreferredChannelConfigurations + : AudioProcessor (BusesProperties() + #if ! JucePlugin_IsMidiEffect + #if ! JucePlugin_IsSynth + .withInput ("Input", AudioChannelSet::stereo(), true) + #endif + .withOutput ("Output", AudioChannelSet::stereo(), true) + #endif + ) +#endif { } @@ -87,27 +97,26 @@ void FILTERCLASSNAME::releaseResources() } #ifndef JucePlugin_PreferredChannelConfigurations -bool FILTERCLASSNAME::setPreferredBusArrangement (bool isInput, int bus, const AudioChannelSet& preferredSet) +bool FILTERCLASSNAME::isBusesLayoutSupported (const BusesLayout& layouts) const { - // Reject any bus arrangements that are not compatible with your plugin - - const int numChannels = preferredSet.size(); - - #if JucePlugin_IsMidiEffect - if (numChannels != 0) - return false; - #elif JucePlugin_IsSynth - if (isInput || (numChannels != 1 && numChannels != 2)) - return false; - #else - if (numChannels != 1 && numChannels != 2) + #if JucePlugin_IsMidiEffect + ignoreUnused (layouts); + return true; + #else + // This is the place where you check if the layout is supported. + // In this template code we only support mono or stereo. + if (layouts.getMainOutputChannelSet() != AudioChannelSet::mono() + && layouts.getMainOutputChannelSet() != AudioChannelSet::stereo()) return false; - if (! AudioProcessor::setPreferredBusArrangement (! isInput, bus, preferredSet)) + // This checks if the input layout matches the output layout + #if ! JucePlugin_IsSynth + if (layouts.getMainOutputChannelSet() != layouts.getMainInputChannelSet()) return false; #endif - return AudioProcessor::setPreferredBusArrangement (isInput, bus, preferredSet); + return true; + #endif } #endif diff --git a/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.h b/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.h index b112aa36..547d09b4 100644 --- a/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.h +++ b/extras/Projucer/Source/BinaryData/jucer_AudioPluginFilterTemplate.h @@ -29,7 +29,7 @@ public: void releaseResources() override; #ifndef JucePlugin_PreferredChannelConfigurations - bool setPreferredBusArrangement (bool isInput, int bus, const AudioChannelSet& preferredSet) override; + bool isBusesLayoutSupported (const BusesLayout& layouts) const override; #endif void processBlock (AudioSampleBuffer&, MidiBuffer&) override; diff --git a/extras/Projucer/Source/BinaryData/projucer_EULA.txt b/extras/Projucer/Source/BinaryData/projucer_EULA.txt index f60dbe00..87b86207 100644 --- a/extras/Projucer/Source/BinaryData/projucer_EULA.txt +++ b/extras/Projucer/Source/BinaryData/projucer_EULA.txt @@ -125,7 +125,7 @@ You should print a copy of this Licence for future reference. 9. Data -9.1. We may collect and process information about your use of or Software through the Software, some of which may amount to your personal data. Personal data will be collected and processed in accordance with our Privacy Policy which can be reviewed at [INSERT LINK TO PRIVACY POLICY]. +9.1. We may collect and process information about your use of or Software through the Software, some of which may amount to your personal data. Personal data will be collected and processed in accordance with our Privacy Policy which can be reviewed at https://www.juce.com/privacy-policy. 10. Other important terms diff --git a/extras/Projucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp b/extras/Projucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp index 5b175d08..eafbe6fa 100644 --- a/extras/Projucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp +++ b/extras/Projucer/Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp @@ -233,7 +233,7 @@ private: { public: ComponentInitialisersProperty (JucerDocument& doc) - : ComponentTextProperty ("Member intialisers", 2048, true, 0, doc) + : ComponentTextProperty ("Member initialisers", 16384, true, 0, doc) { preferredHeight = 24 * 3; } diff --git a/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.cpp b/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.cpp index e8cd6108..23c906b4 100644 --- a/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.cpp +++ b/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.cpp @@ -149,7 +149,15 @@ public: { #if RUN_CLANG_IN_CHILD_PROCESS if (childProcess.isRunning()) + { + #if JUCE_DEBUG killServerPolitely(); + #else + // in release builds we don't want to wait + // for the server to clean up and shut down + killServerWithoutMercy(); + #endif + } #endif } @@ -605,7 +613,8 @@ bool CompileEngineChildProcess::canLaunchApp() const return process != nullptr && runningAppProcess == nullptr && activityList.getNumActivities() == 0 - && errorList.getNumErrors() == 0; + && errorList.getNumErrors() == 0 + && project.getProjectType().isGUIApplication(); } void CompileEngineChildProcess::launchApp() diff --git a/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineDLL.h b/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineDLL.h index 2d4b9091..262b359b 100644 --- a/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineDLL.h +++ b/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineDLL.h @@ -29,14 +29,7 @@ struct CompileEngineDLL { CompileEngineDLL() { - File f = findDLLFile(); - - if (f != File() && dll.open (f.getLinkedTarget().getFullPathName())) - { - #define INIT_LIVE_DLL_FN(name, returnType, params) name = (name##_type) dll.getFunction (#name); - LIVE_DLL_FUNCTIONS (INIT_LIVE_DLL_FN); - #undef INIT_LIVE_DLL_FN - } + tryLoadDll(); } ~CompileEngineDLL() @@ -44,6 +37,22 @@ struct CompileEngineDLL shutdown(); } + void tryLoadDll() + { + // never load the dynamic lib multiple times + if (! isLoaded()) + { + File f = findDLLFile(); + + if (f != File() && dll.open (f.getLinkedTarget().getFullPathName())) + { + #define INIT_LIVE_DLL_FN(name, returnType, params) name = (name##_type) dll.getFunction (#name); + LIVE_DLL_FUNCTIONS (INIT_LIVE_DLL_FN); + #undef INIT_LIVE_DLL_FN + } + } + } + void initialise (CrashCallbackFunction crashFn, QuitCallbackFunction quitFn, bool setupSignals) { if (isLoaded()) @@ -87,86 +96,76 @@ struct CompileEngineDLL #endif } - static bool isDLLFile (const File& f) + static File getVersionedUserAppSupportFolder() { - return f.getFileName().equalsIgnoreCase (getDLLName()) && f.exists(); + File userAppData (File::getSpecialLocation (File::userApplicationDataDirectory)); + + #if JUCE_MAC + userAppData = userAppData.getChildFile ("Application Support"); + #endif + + return userAppData.getChildFile (String ("Projucer-") + ProjectInfo::versionString); } +private: + DynamicLibrary dll; + + enum { requiredVersion = 1 }; + static File findDLLFile() { - File appFile = File::getSpecialLocation (File::currentApplicationFile); + File dllFile; - #if JUCE_MAC - // Look in the app bundle.. - for (DirectoryIterator i (appFile, true, "*", File::findFilesAndDirectories); i.next();) - if (isDLLFile (i.getFile())) - return i.getFile(); - - { - // Try in Application Support.. - File f = File ("~/Library/Application Support/Projucer").getChildFile (getDLLName()); - if (isDLLFile (f)) - return f; - - f = File ("/Library/Application Support/Projucer").getChildFile (getDLLName()); - if (isDLLFile (f)) - return f; - } + if (tryFindDLLFileInAppFolder(dllFile)) + return dllFile; - #elif JUCE_WINDOWS - { - // Look in the application folder - File f = appFile.getParentDirectory().getChildFile (getDLLName()); - if (isDLLFile (f)) - return f; - } - #elif JUCE_LINUX - // TODO? - #else - #error + #if JUCE_MAC + if (tryFindDLLFileInAppBundle(dllFile)) + return dllFile; #endif - { - // Look for a DLL in extras/Projucer/Builds - File f = appFile.getParentDirectory(); - - for (int i = 5; --i >= 0;) - { - if (f.getFileName().equalsIgnoreCase ("Builds") - && f.getParentDirectory().getFileName().equalsIgnoreCase ("Projucer")) - { - f = f.getSiblingFile (getDLLName()); - if (isDLLFile (f)) - return f; + if (tryFindDLLFileInAppConfigFolder(dllFile)) + return dllFile; - break; - } + return File(); + } - f = f.getParentDirectory(); - } - } + #if JUCE_MAC + static bool tryFindDLLFileInAppBundle(File &outFile) + { + File currentAppFile (File::getSpecialLocation (File::currentApplicationFile)); + return tryFindDLLFileInFolder (currentAppFile.getChildFile ("Contents"), outFile); + } + #endif - // See if there's one in the same folder as the app... - File f = appFile.getSiblingFile (getDLLName()); - if (isDLLFile (f)) - return f; + static bool tryFindDLLFileInAppFolder(File &outFile) + { + File currentAppFile (File::getSpecialLocation (File::currentApplicationFile)); + return tryFindDLLFileInFolder (currentAppFile.getParentDirectory(), outFile); + } - // Look in some common folders as a last resort.. - f = File::getSpecialLocation (File::userHomeDirectory).getChildFile (getDLLName()); - if (isDLLFile (f)) - return f; + static bool tryFindDLLFileInAppConfigFolder(File &outFile) + { + File userAppDataFolder (getVersionedUserAppSupportFolder()); + return tryFindDLLFileInFolder (userAppDataFolder, outFile); + } - f = File::getSpecialLocation (File::userDocumentsDirectory).getChildFile (getDLLName()); - if (isDLLFile (f)) - return f; + static bool tryFindDLLFileInFolder(File folder, File& outFile) + { + File file = folder.getChildFile (getDLLName()); + if (isDLLFile (file)) + { + outFile = file; + return true; + } - return File(); + return false; } -private: - DynamicLibrary dll; - - enum { requiredVersion = 1 }; + static bool isDLLFile (const File& f) + { + return f.getFileName().equalsIgnoreCase (getDLLName()) && f.exists(); + } static void setPropertyCallback (const char* key, const char* value) { diff --git a/extras/Projucer/Source/LiveBuildEngine/projucer_DiagnosticMessage.h b/extras/Projucer/Source/LiveBuildEngine/projucer_DiagnosticMessage.h index 74e746a9..e3a74b6e 100644 --- a/extras/Projucer/Source/LiveBuildEngine/projucer_DiagnosticMessage.h +++ b/extras/Projucer/Source/LiveBuildEngine/projucer_DiagnosticMessage.h @@ -63,6 +63,24 @@ struct DiagnosticMessage bool isWarning() const noexcept { return type == warning; } bool isNote() const noexcept { return type == note; } + String toString() const + { + // todo: copy recursively from root + String res; + + switch (type) + { + case error: res << "error: "; break; + case warning: res << "warning: "; break; + case note: res << "note: "; break; + }; + + res << range.file << ": "; + res << message << "\n"; + + return res; + } + ValueTree toValueTree() const { ValueTree v (MessageTypes::DIAGNOSTIC); @@ -107,6 +125,7 @@ struct DiagnosticReceiver { virtual ~DiagnosticReceiver() {} virtual void handleDiagnostic (const DiagnosticMessage&) = 0; + virtual void handleRecoverableErrorPCH (const DiagnosticMessage& m, String pchFileName, String sourceFileName) = 0; }; //============================================================================== @@ -114,8 +133,8 @@ struct DiagnosticList { // after some research, it seems that notes never come on their own // i.e. they always have a warning / error preceding them - // so we can use this to keep notes and their associated notes together - // by keeping track of the last message + // so we can keep notes and their associated diagnostics + // together by keeping track of the last message DiagnosticMessage lastMessage; ValueTree list { MessageTypes::DIAGNOSTIC_LIST }; @@ -151,6 +170,33 @@ struct DiagnosticList list.addChild (l.list.getChild(i).createCopy(), -1, nullptr); } + void remove (DiagnosticMessage m) + { + auto n = m.toValueTree(); + + for (int i = 0; i < list.getNumChildren(); ++i) + { + if (list.getChild (i).isEquivalentTo (n)) + { + list.removeChild (i, nullptr); + return; + } + } + + jassertfalse; + } + + bool hasRecoveryWarning (DiagnosticMessage m) const + { + auto n = m.toValueTree(); + + for (int i = 0; i < list.getNumChildren(); ++i) + if (list.getChild (i).isEquivalentTo (n)) + return true; + + return false; + } + const ValueTree& toValueTree() const noexcept { return list; diff --git a/extras/Projucer/Source/LiveBuildEngine/projucer_ErrorListComponent.h b/extras/Projucer/Source/LiveBuildEngine/projucer_ErrorListComponent.h index 543e11ad..0555e0de 100644 --- a/extras/Projucer/Source/LiveBuildEngine/projucer_ErrorListComponent.h +++ b/extras/Projucer/Source/LiveBuildEngine/projucer_ErrorListComponent.h @@ -237,6 +237,19 @@ private: } }; + void showPopupMenu() override + { + PopupMenu menu; + menu.addItem (1, "Copy"); + launchPopupMenu (menu); + } + + void handlePopupMenuResult (int resultCode) override + { + if (resultCode == 1) + SystemClipboard::copyTextToClipboard (message.toString()); + } + void paintIcon (Graphics& g, Rectangle area) override { getIcon().draw (g, area.toFloat(), isIconCrossedOut()); diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidBase.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidBase.h index d4b7fbf0..aad706fb 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidBase.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidBase.h @@ -35,7 +35,7 @@ public: androidMinimumSDK (settings, Ids::androidMinimumSDK, nullptr, "23"), androidTheme (settings, Ids::androidTheme, nullptr), androidInternetNeeded (settings, Ids::androidInternetNeeded, nullptr, true), - androidMicNeeded (settings, Ids::androidMicNeeded, nullptr, false), + androidMicNeeded (settings, Ids::microphonePermissionNeeded, nullptr, false), androidBluetoothNeeded (settings, Ids::androidBluetoothNeeded, nullptr, true), androidOtherPermissions (settings, Ids::androidOtherPermissions, nullptr), androidKeyStore (settings, Ids::androidKeyStore, nullptr, "${user.home}/.android/debug.keystore"), @@ -129,10 +129,10 @@ public: props.add (new TextWithDefaultPropertyComponent (androidVersionCode, "Android Version Code", 32), "An integer value that represents the version of the application code, relative to other versions."); - props.add (new DependencyPathPropertyComponent (sdkPath, "Android SDK Path"), + props.add (new DependencyPathPropertyComponent (project.getFile().getParentDirectory(), sdkPath, "Android SDK Path"), "The path to the Android SDK folder on the target build machine"); - props.add (new DependencyPathPropertyComponent (ndkPath, "Android NDK Path"), + props.add (new DependencyPathPropertyComponent (project.getFile().getParentDirectory(), ndkPath, "Android NDK Path"), "The path to the Android NDK folder on the target build machine"); props.add (new TextWithDefaultPropertyComponent (androidMinimumSDK, "Minimum SDK version", 32), diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h index 4b873964..587d6227 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h @@ -50,8 +50,8 @@ public: //============================================================================== AndroidStudioProjectExporter (Project& p, const ValueTree& t) : AndroidProjectExporterBase (p, t), - gradleVersion (settings, Ids::gradleVersion, nullptr, "2.10"), - gradleWrapperVersion (settings, Ids::gradleWrapperVersion, nullptr, "0.7.0-rc1"), + gradleVersion (settings, Ids::gradleVersion, nullptr, "2.14.1"), + gradleWrapperVersion (settings, Ids::gradleWrapperVersion, nullptr, "0.8.1"), gradleToolchain (settings, Ids::gradleToolchain, nullptr, "clang"), buildToolsVersion (settings, Ids::buildToolsVersion, nullptr, "23.0.2"), androidStudioExecutable (findAndroidStudioExecutable()) @@ -127,6 +127,13 @@ public: writeFile (targetFolder, "local.properties", getLocalPropertiesFileContent()); writeFile (targetFolder, "gradle/wrapper/gradle-wrapper.properties", getGradleWrapperPropertiesFileContent()); + writeBinaryFile (targetFolder, "gradle/wrapper/LICENSE-for-gradlewrapper.txt", BinaryData::LICENSE, BinaryData::LICENSESize); + writeBinaryFile (targetFolder, "gradle/wrapper/gradle-wrapper.jar", BinaryData::gradlewrapper_jar, BinaryData::gradlewrapper_jarSize); + writeBinaryFile (targetFolder, "gradlew", BinaryData::gradlew, BinaryData::gradlewSize); + writeBinaryFile (targetFolder, "gradlew.bat", BinaryData::gradlew_bat, BinaryData::gradlew_batSize); + + targetFolder.getChildFile ("gradlew").setExecutePermission (true); + writeAndroidManifest (targetFolder); writeStringsXML (targetFolder); writeAppIcons (targetFolder); @@ -150,6 +157,13 @@ public: overwriteFileIfDifferentOrThrow (gradleProjectFolder.getChildFile (filePath), outStream); } + void writeBinaryFile (const File& gradleProjectFolder, const String& filePath, const char* binaryData, const int binarySize) const + { + MemoryOutputStream outStream; + outStream.write (binaryData, static_cast (binarySize)); + overwriteFileIfDifferentOrThrow (gradleProjectFolder.getChildFile (filePath), outStream); + } + //============================================================================== static File findAndroidStudioExecutable() { diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h index bc58f252..ba031c75 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h @@ -174,7 +174,7 @@ private: if (previousBuildCommands.isNotEmpty()) script += "\r\n"; - script += "copy /Y \"$(OutDir)\\$(TargetFileName)\" \"$(OutDir)\\$(TargetName).vst3\""; + script += "copy /Y \"$(OutDir)$(TargetFileName)\" \"$(OutDir)$(TargetName).vst3\""; config->getValue (Ids::internalPostBuildComamnd) = previousBuildCommands + script; } @@ -194,28 +194,36 @@ private: if (config->getValue(Ids::postbuildCommand).toString().isEmpty()) { const String previousBuildCommands = config->getValue (Ids::internalPostBuildComamnd).toString(); + const String aaxSDKPath = File::isAbsolutePath(aaxPath.toString()) + ? aaxPath.toString() + : String ("..\\..\\") + aaxPath.toString(); const bool is64Bit = (config->getValue (Ids::winArchitecture) == "x64"); - const String bundleDir = "$(OutDir)\\$(TargetName).aaxplugin"; + const String bundleDir = "$(OutDir)$(TargetName).aaxplugin"; const String bundleContents = bundleDir + "\\Contents"; const String macOSDir = bundleContents + String ("\\") + (is64Bit ? "x64" : "Win32"); const String executable = macOSDir + String ("\\$(TargetName).aaxplugin"); - const String bundleScript = aaxPath.toString() + String ("\\Utilities\\CreatePackage.bat"); + const String bundleScript = aaxSDKPath + String ("\\Utilities\\CreatePackage.bat"); String iconFilePath = getTargetFolder().getChildFile ("icon.ico").getFullPathName(); if (! File (iconFilePath).existsAsFile()) - iconFilePath = aaxPath.toString() + String ("\\Utilities\\PlugIn.ico"); + iconFilePath = aaxSDKPath + String ("\\Utilities\\PlugIn.ico"); String script; if (previousBuildCommands.isNotEmpty()) script += "\r\n"; - script += String ("mkdir \"") + bundleDir + String ("\"\r\n"); - script += String ("mkdir \"") + bundleContents + String ("\"\r\n"); - script += String ("mkdir \"") + macOSDir + String ("\"\r\n"); - script += String ("copy /Y \"$(OutDir)\\$(TargetFileName)\" \"") + executable + String ("\"\r\n"); - script += bundleScript + String (" \"") + macOSDir + String ("\" \"") + iconFilePath + String ("\""); + StringArray folders; + folders.add (bundleDir); + folders.add (bundleContents); + folders.add (macOSDir); + + for (int i = 0; i < folders.size(); ++i) + script += String ("if not exist \"") + folders[i] + String ("\" mkdir \"") + folders[i] + String ("\"\r\n"); + + script += String ("copy /Y \"$(OutDir)$(TargetFileName)\" \"") + executable + String ("\"\r\n"); + script += String ("\"") + bundleScript + String ("\" \"") + macOSDir + String ("\" \"") + iconFilePath + String ("\""); config->getValue (Ids::internalPostBuildComamnd) = previousBuildCommands + script; } diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h index c8196152..3d0c40d4 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h @@ -97,6 +97,8 @@ public: Value getCustomXcassetsFolderValue() { return getSetting (Ids::customXcassetsFolder); } String getCustomXcassetsFolderString() const { return settings [Ids::customXcassetsFolder]; } + Value getMicrophonePermissionValue() { return getSetting (Ids::microphonePermissionNeeded); } + bool isMicrophonePermissionEnabled() const { return settings [Ids::microphonePermissionNeeded]; } Value getInAppPurchasesValue() { return getSetting (Ids::iosInAppPurchases); } bool isInAppPurchasesEnabled() const { return settings [Ids::iosInAppPurchases]; } Value getBackgroundAudioValue() { return getSetting (Ids::iosBackgroundAudio); } @@ -161,6 +163,10 @@ public: props.add (new BooleanPropertyComponent (getSetting ("UIStatusBarHidden"), "Status Bar Hidden", "Enabled"), "Enable this to disable the status bar in your app."); + props.add (new BooleanPropertyComponent (getMicrophonePermissionValue(), "Microphone access", "Enabled"), + "Enable this to allow your app to use the microphone. " + "The user of your app will be prompted to grant microphone access permissions."); + props.add (new BooleanPropertyComponent (getInAppPurchasesValue(), "In-App purchases capability", "Enabled"), "Enable this to grant your app the capability for in-app purchases. " "This option requires that you specify a valid Development Team ID."); @@ -244,7 +250,7 @@ public: writeInfoPlistFiles(); // Deleting the .rsrc files can be needed to force Xcode to update the version number. - deleteRsrcFiles(); + deleteRsrcFiles (getTargetFolder().getChildFile ("build")); if (! ProjucerApplication::getApp().isRunningCommandLine) { @@ -1151,6 +1157,8 @@ public: if (owner.iOS) { addPlistDictionaryKeyBool (dict, "LSRequiresIPhoneOS", true); + if (owner.isMicrophonePermissionEnabled()) + addPlistDictionaryKey (dict, "NSMicrophoneUsageDescription", "This app requires microphone input."); if (type != AudioUnitv3PlugIn) addPlistDictionaryKeyBool (dict, "UIViewControllerBasedStatusBarAppearance", false); @@ -1302,13 +1310,24 @@ public: XmlElement plistEntry ("array"); XmlElement* dict = plistEntry.createNewChildElement ("dict"); + const String pluginManufacturerCode = owner.project.getPluginManufacturerCode().toString().trim().substring (0, 4); + const String pluginSubType = owner.project.getPluginCode() .toString().trim().substring (0, 4); + + if (pluginManufacturerCode.toLowerCase() == pluginManufacturerCode) + { + throw SaveError ("AudioUnit plugin code identifiers invalid!\n\n" + "You have used only lower case letters in your AU plugin manufacturer identifier. " + "You must have at least one uppercase letter in your AU plugin manufacturer " + "identifier code."); + } + addPlistDictionaryKey (dict, "name", owner.project.getPluginManufacturer().toString() + ": " + owner.project.getPluginName().toString()); addPlistDictionaryKey (dict, "description", owner.project.getPluginDesc().toString()); addPlistDictionaryKey (dict, "factoryFunction", owner.project.getPluginAUExportPrefix().toString() + "Factory"); - addPlistDictionaryKey (dict, "manufacturer", owner.project.getPluginManufacturerCode().toString().trim().substring (0, 4)); + addPlistDictionaryKey (dict, "manufacturer", pluginManufacturerCode); addPlistDictionaryKey (dict, "type", owner.project.getAUMainTypeCode()); - addPlistDictionaryKey (dict, "subtype", owner.project.getPluginCode().toString().trim().substring (0, 4)); + addPlistDictionaryKey (dict, "subtype", pluginSubType); addPlistDictionaryKeyInt (dict, "version", owner.project.getVersionAsHexInteger()); xcodeExtraPListEntries.add (plistKey); @@ -1857,10 +1876,21 @@ private: target->writeInfoPlistFile(); } - void deleteRsrcFiles() const + // Delete .rsrc files in folder but don't follow sym-links + void deleteRsrcFiles (const File& folder) const { - for (DirectoryIterator di (getTargetFolder().getChildFile ("build"), true, "*.rsrc", File::findFiles); di.next();) - di.getFile().deleteFile(); + for (DirectoryIterator di (folder, false, "*", File::findFilesAndDirectories); di.next();) + { + const File& entry = di.getFile(); + + if (! entry.isSymbolicLink()) + { + if (entry.existsAsFile() && entry.getFileExtension().toLowerCase() == ".rsrc") + entry.deleteFile(); + else if (entry.isDirectory()) + deleteRsrcFiles (entry); + } + } } String getHeaderSearchPaths (const BuildConfiguration& config) const diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp index c43b44f2..f0382e84 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp @@ -244,19 +244,19 @@ void ProjectExporter::createDependencyPathProperties (PropertyListBuilder& props { if (supportsVST3() && (project.shouldBuildVST3().getValue() || project.isVST3PluginHost())) { - props.add (new DependencyPathPropertyComponent (getVST3PathValue(), "VST3 SDK Folder"), + props.add (new DependencyPathPropertyComponent (project.getFile().getParentDirectory(), getVST3PathValue(), "VST3 SDK Folder"), "If you're building a VST3 plugin or host, this must be the folder containing the VST3 SDK. This can be an absolute path, or a path relative to the Projucer project file."); } if (supportsAAX() && project.shouldBuildAAX().getValue()) { - props.add (new DependencyPathPropertyComponent (getAAXPathValue(), "AAX SDK Folder"), + props.add (new DependencyPathPropertyComponent (project.getFile().getParentDirectory(), getAAXPathValue(), "AAX SDK Folder"), "If you're building an AAX plugin, this must be the folder containing the AAX SDK. This can be an absolute path, or a path relative to the Projucer project file."); } if (supportsRTAS() && project.shouldBuildRTAS().getValue()) { - props.add (new DependencyPathPropertyComponent (getRTASPathValue(), "RTAS SDK Folder"), + props.add (new DependencyPathPropertyComponent (project.getFile().getParentDirectory(), getRTASPathValue(), "RTAS SDK Folder"), "If you're building an RTAS, this must be the folder containing the RTAS SDK. This can be an absolute path, or a path relative to the Projucer project file."); } } diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h index ebdb6749..9af082e7 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h @@ -624,34 +624,41 @@ private: // keep a copy of the basic generated files group, as each exporter may modify it. const ValueTree originalGeneratedGroup (generatedFilesGroup.state.createCopy()); - for (Project::ExporterIterator exporter (project); exporter.next();) + try { - if (exporter->getTargetFolder().createDirectory()) + for (Project::ExporterIterator exporter (project); exporter.next();) { - exporter->copyMainGroupFromProject(); - exporter->settings = exporter->settings.createCopy(); + if (exporter->getTargetFolder().createDirectory()) + { + exporter->copyMainGroupFromProject(); + exporter->settings = exporter->settings.createCopy(); - exporter->addToExtraSearchPaths (RelativePath ("JuceLibraryCode", RelativePath::projectFolder)); + exporter->addToExtraSearchPaths (RelativePath ("JuceLibraryCode", RelativePath::projectFolder)); - generatedFilesGroup.state = originalGeneratedGroup.createCopy(); - exporter->addSettingsForProjectType (project.getProjectType()); + generatedFilesGroup.state = originalGeneratedGroup.createCopy(); + exporter->addSettingsForProjectType (project.getProjectType()); - for (auto& module: modules) - module->addSettingsForModuleToExporter (*exporter, *this); + for (auto& module: modules) + module->addSettingsForModuleToExporter (*exporter, *this); - if (project.getProjectType().isAudioPlugin()) - writePluginCharacteristicsFile(); + if (project.getProjectType().isAudioPlugin()) + writePluginCharacteristicsFile(); - generatedFilesGroup.sortAlphabetically (true, true); - exporter->getAllGroups().add (generatedFilesGroup); + generatedFilesGroup.sortAlphabetically (true, true); + exporter->getAllGroups().add (generatedFilesGroup); - threadPool.addJob (new ExporterJob (*this, exporter.exporter.release(), modules), true); - } - else - { - addError ("Can't create folder: " + exporter->getTargetFolder().getFullPathName()); + threadPool.addJob (new ExporterJob (*this, exporter.exporter.release(), modules), true); + } + else + { + addError ("Can't create folder: " + exporter->getTargetFolder().getFullPathName()); + } } } + catch (ProjectExporter::SaveError& saveError) + { + addError (saveError.message); + } while (threadPool.getNumJobs() > 0) Thread::sleep (10); diff --git a/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.cpp b/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.cpp index 69d9e3f6..8b6956f3 100644 --- a/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.cpp +++ b/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.cpp @@ -40,20 +40,27 @@ DependencyPathValueSource::DependencyPathValueSource (const Value& projectSettin globalSettingsValue.addListener (this); } -bool DependencyPathValueSource::isValidPath() const +bool DependencyPathValueSource::isValidPath (const File& relativeTo) const { // if we are on another OS than the one which this path setting is for, // we have no way of knowing whether the path is valid - so just assume it is: if (! appliesToThisOS()) return true; - return getAppSettings().isGlobalPathValid (globalKey, getValue().toString()); + return getAppSettings().isGlobalPathValid (relativeTo, globalKey, getValue().toString()); +} + +bool DependencyPathValueSource::isValidPath() const +{ + return isValidPath (File::getCurrentWorkingDirectory()); } //============================================================================== -DependencyPathPropertyComponent::DependencyPathPropertyComponent (const Value& value, +DependencyPathPropertyComponent::DependencyPathPropertyComponent (const File& pathRelativeToUse, + const Value& value, const String& propertyName) try : TextPropertyComponent (propertyName, 1024, false), + pathRelativeTo (pathRelativeToUse), pathValue (value), pathValueSource (dynamic_cast (pathValue.getValueSource())) { @@ -100,11 +107,11 @@ void DependencyPathPropertyComponent::textWasEdited() Colour DependencyPathPropertyComponent::getTextColourToDisplay() const { if (! pathValueSource.isUsingProjectSettings()) - return pathValueSource.isValidPath() ? Colours::grey - : Colours::lightpink; + return pathValueSource.isValidPath (pathRelativeTo) ? Colours::grey + : Colours::lightpink; - return pathValueSource.isValidPath() ? Colours::black - : Colours::red; + return pathValueSource.isValidPath (pathRelativeTo) ? Colours::black + : Colours::red; } void DependencyPathPropertyComponent::labelTextChanged (Label*) diff --git a/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.h b/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.h index 36dd1f59..582e7c8d 100644 --- a/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.h +++ b/extras/Projucer/Source/Project/jucer_DependencyPathPropertyComponent.h @@ -82,6 +82,8 @@ public: return os == TargetOS::getThisOS(); } + bool isValidPath (const File& relativeTo) const; + bool isValidPath() const; private: @@ -143,7 +145,8 @@ class DependencyPathPropertyComponent : public TextPropertyComponent, private Label::Listener { public: - DependencyPathPropertyComponent (const Value& value, + DependencyPathPropertyComponent (const File& pathRelativeToUse, + const Value& value, const String& propertyName); @@ -158,6 +161,10 @@ private: /** This function handles path changes because the global path changed. */ void valueChanged (Value& value) override; + /** If the dependency path is relative, relative to which directory should + we check if an object is available. */ + File pathRelativeTo; + /** the value that represents this dependency path setting. */ Value pathValue; diff --git a/extras/Projucer/Source/Project/jucer_Module.cpp b/extras/Projucer/Source/Project/jucer_Module.cpp index 307c52db..307e458a 100644 --- a/extras/Projucer/Source/Project/jucer_Module.cpp +++ b/extras/Projucer/Source/Project/jucer_Module.cpp @@ -168,22 +168,39 @@ StringArray ModuleList::getIDs() const return results; } -Result ModuleList::addAllModulesInFolder (const File& path) +Result ModuleList::tryToAddModuleFromFolder (const File& path) { ModuleDescription m (path); - if (m.isValid()) { modules.add (new ModuleDescription (m)); + return Result::ok(); } - else + + return Result::fail (path.getFullPathName() + " is not a valid module"); +} + +Result ModuleList::addAllModulesInFolder (const File& path) +{ + if (! tryToAddModuleFromFolder (path)) + { + const int subfolders = 2; + return addAllModulesInSubfoldersRecursively (path, subfolders); + } + + return Result::ok(); +} + +Result ModuleList::addAllModulesInSubfoldersRecursively (const File& path, int depth) +{ + if (depth > 0) { for (DirectoryIterator iter (path, false, "*", File::findDirectories); iter.next();) { - Result r = addAllModulesInFolder (iter.getFile().getLinkedTarget()); + const File& childPath = iter.getFile().getLinkedTarget(); - if (r.failed()) - return r; + if (! tryToAddModuleFromFolder (childPath)) + addAllModulesInSubfoldersRecursively (childPath, depth - 1); } } diff --git a/extras/Projucer/Source/Project/jucer_Module.h b/extras/Projucer/Source/Project/jucer_Module.h index 3c6c524a..adc42458 100644 --- a/extras/Projucer/Source/Project/jucer_Module.h +++ b/extras/Projucer/Source/Project/jucer_Module.h @@ -74,7 +74,10 @@ struct ModuleList StringArray getIDs() const; void sort(); + Result tryToAddModuleFromFolder (const File&); + Result addAllModulesInFolder (const File&); + Result addAllModulesInSubfoldersRecursively (const File&, int depth); Result scanAllKnownFolders (Project&); OwnedArray modules; diff --git a/extras/Projucer/Source/Project/jucer_ProjectContentComponent.cpp b/extras/Projucer/Source/Project/jucer_ProjectContentComponent.cpp index 40a66429..cfb3a2fb 100644 --- a/extras/Projucer/Source/Project/jucer_ProjectContentComponent.cpp +++ b/extras/Projucer/Source/Project/jucer_ProjectContentComponent.cpp @@ -27,6 +27,7 @@ #include "jucer_Module.h" #include "../Application/jucer_MainWindow.h" #include "../Application/jucer_Application.h" +#include "../Application/jucer_DownloadCompileEngineThread.h" #include "../Code Editor/jucer_SourceCodeEditor.h" #include "../Utility/jucer_FilePathPropertyComponent.h" #include "jucer_TreeItemTypes.h" @@ -330,6 +331,7 @@ void ProjectContentComponent::rebuildProjectTabs() resized(); } + //============================================================================== struct BuildTabComponent : public ConcertinaPanel { @@ -355,7 +357,8 @@ struct ProjucerDisabledComp : public Component, private Button::Listener { ProjucerDisabledComp (String message, bool loggedIn, bool showSubscribeButton, - bool showSignInButton, bool showSwitchAccountButton) + bool showSignInButton, bool showSwitchAccountButton, + bool showDownloadButton) : isLoggedIn (loggedIn) { infoLabel.setColour (Label::textColourId, findColour (mainBackgroundColourId).contrasting (0.7f)); @@ -383,6 +386,13 @@ struct ProjucerDisabledComp : public Component, addAndMakeVisible (*switchAccountButton); switchAccountButton->addListener (this); } + + if (showDownloadButton) + { + downloadButton = new TextButton (String ("Download live-build engine")); + addAndMakeVisible (*downloadButton); + downloadButton->addListener (this); + } } void resized() override @@ -417,6 +427,13 @@ struct ProjucerDisabledComp : public Component, { switchAccountButton->setSize (buttonWidth, buttonHeight); switchAccountButton->setCentrePosition (buttonCenterX, buttonCenterY); + buttonCenterY += itemDistance + buttonHeight; + } + + if (downloadButton.get() != nullptr) + { + downloadButton->setSize (buttonWidth, buttonHeight); + downloadButton->setCentrePosition (buttonCenterX, buttonCenterY); } } @@ -424,7 +441,7 @@ struct ProjucerDisabledComp : public Component, { if (btn == subscribeButton.get()) { - URL ("http://www.juce.com/get-juce").launchInDefaultBrowser(); + URL ("http://www.juce.com/get-juce#indie").launchInDefaultBrowser(); } else if (btn == signInButton.get()) { @@ -434,6 +451,26 @@ struct ProjucerDisabledComp : public Component, { ProjucerApplication::getApp().showLoginForm(); } + else if (btn == downloadButton.get()) + { + if (DownloadCompileEngineThread::downloadAndInstall()) + { + if (! ProjucerLicenses::getInstance()->retryLoadDll()) + { + AlertWindow::showMessageBox(AlertWindow::WarningIcon, + "Download and install", + "Loading the live-build engine failed"); + return; + } + + // async! + ProjucerApplication::getApp().showLoginForm(); + + // if sign in successful project tabs update, otherwise they were not + auto parent = findParentComponentOfClass(); + parent->rebuildProjectTabs(); + } + } } bool isLoggedIn; @@ -443,6 +480,7 @@ private: ScopedPointer subscribeButton; ScopedPointer signInButton; ScopedPointer switchAccountButton; + ScopedPointer downloadButton; }; struct EnableBuildComp : public Component @@ -476,11 +514,6 @@ struct EnableBuildComp : public Component //============================================================================== Component* ProjectContentComponent::createBuildTab (CompileEngineChildProcess* child) { - #if JUCE_LINUX - ignoreUnused (child); - return new ProjucerDisabledComp ("Linux support is still under development - " - "please check for updates at www.juce.com!", false, false, false, false); - #else if (child != nullptr) { child->crashHandler = [this] (const String& m) { this->handleCrash (m); }; @@ -489,31 +522,66 @@ Component* ProjectContentComponent::createBuildTab (CompileEngineChildProcess* c } jassert (project != nullptr); + + const auto osType = SystemStats::getOperatingSystemType(); + const bool isMac = (osType & SystemStats::MacOSX) != 0; + const bool isWin = (osType & SystemStats::Windows) != 0; + const bool isLinux = (osType & SystemStats::Linux) != 0; + + if (! isMac && ! isWin && ! isLinux) + return createDisabledBuildTabInfoOnly ( + "Live-build features are not supported on your system.\n\n" + "Please check supported platforms at www.juce.com!"); + + if (isLinux) + return createDisabledBuildTabInfoOnly ( + "Live-build features for Linux are under development.\n\n" + "Please check for updates at www.juce.com!"); + + if (isMac) + if (osType < SystemStats::MacOSX_10_9) + return createDisabledBuildTabInfoOnly ( + "Live-build features are available only on MacOSX 10.9 or higher."); + + if (isWin) + if (! SystemStats::isOperatingSystem64Bit() || osType < SystemStats::Windows8_0) + return createDisabledBuildTabInfoOnly ( + "Live-build features are available only on 64-Bit Windows 8 or higher."); + const auto& unlockStatus = *ProjucerLicenses::getInstance(); - if (unlockStatus.hasLiveCodingLicence()) - { - jassert (unlockStatus.isLoggedIn()); - jassert (unlockStatus.isDLLPresent()); - return new EnableBuildComp(); - } + if (! unlockStatus.isLoggedIn()) + return createDisabledBuildTabSubscribe ("Sign in with your ROLI account", + false, unlockStatus.isDLLPresent()); - return createDisabledBuildTab(unlockStatus.isLoggedIn(), - unlockStatus.isDLLPresent()); - #endif -}; + if (! unlockStatus.hasLiveCodingLicence()) + return createDisabledBuildTabSubscribe ("Subscribe to JUCE Pro or Indie", + true, unlockStatus.isDLLPresent()); -//============================================================================== -Component* ProjectContentComponent::createDisabledBuildTab(bool loggedIn, bool dllPresent) { + jassert (unlockStatus.isLoggedIn()); + jassert (unlockStatus.isDLLPresent()); + return new EnableBuildComp(); +} + +Component* ProjectContentComponent::createDisabledBuildTabSubscribe (String textPrefix, + bool loggedIn, bool dllPresent) +{ bool showSubscribeButton = true; bool showSignInButton = dllPresent && ! loggedIn; bool showSwitchAccountButton = dllPresent && loggedIn; + bool showDownloadButton = ! dllPresent; return new ProjucerDisabledComp ( - "Subscribe to JUCE Pro or Indie to use the Projucer's live-build features:", - loggedIn, showSubscribeButton, showSignInButton, showSwitchAccountButton); + textPrefix + " to use the Projucer's live-build features:", + loggedIn, showSubscribeButton, showSignInButton, showSwitchAccountButton, showDownloadButton); } +Component* ProjectContentComponent::createDisabledBuildTabInfoOnly(const char* message) +{ + return new ProjucerDisabledComp (message, false, false, false, false, false); +} + +//============================================================================== BuildTabComponent* findBuildTab (const TabbedComponent& tabs) { return dynamic_cast (tabs.getTabContentComponent (2)); @@ -1527,7 +1595,7 @@ void ProjectContentComponent::handleMissingSystemHeaders() createProjectTabs(); bool isLoggedIn = ProjucerLicenses::getInstance()->isLoggedIn(); - ProjucerDisabledComp* buildTab = new ProjucerDisabledComp (tabMessage, isLoggedIn, false, false, false); + ProjucerDisabledComp* buildTab = new ProjucerDisabledComp (tabMessage, isLoggedIn, false, false, false, false); treeViewTabs.addTab ("Build", Colours::transparentBlack, buildTab, true); showBuildTab(); diff --git a/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h b/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h index 534079f2..55dde800 100644 --- a/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h +++ b/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h @@ -154,7 +154,8 @@ private: void timerCallback() override; Component* createBuildTab (CompileEngineChildProcess*); - Component* createDisabledBuildTab (bool loggedIn, bool dllPresent); + Component* createDisabledBuildTabSubscribe (String textPrefix, bool loggedIn, bool dllPresent); + Component* createDisabledBuildTabInfoOnly (const char* messsage); bool isContinuousRebuildEnabled() { return getAppSettings().getGlobalProperties().getBoolValue ("continuousRebuild", true); } void setContinuousRebuildEnabled (bool b) { getAppSettings().getGlobalProperties().setValue ("continuousRebuild", b); } diff --git a/extras/Projucer/Source/Utility/jucer_PresetIDs.h b/extras/Projucer/Source/Utility/jucer_PresetIDs.h index e594a8c8..b65beff8 100644 --- a/extras/Projucer/Source/Utility/jucer_PresetIDs.h +++ b/extras/Projucer/Source/Utility/jucer_PresetIDs.h @@ -147,6 +147,7 @@ namespace Ids DECLARE_ID (showAllCode); DECLARE_ID (useLocalCopy); DECLARE_ID (overwriteOnSave); + DECLARE_ID (microphonePermissionNeeded); DECLARE_ID (androidActivityClass); DECLARE_ID (androidActivitySubClassName); DECLARE_ID (androidVersionCode); @@ -154,7 +155,6 @@ namespace Ids DECLARE_ID (androidNDKPath); DECLARE_ID (androidInternetNeeded); DECLARE_ID (androidArchitectures); - DECLARE_ID (androidMicNeeded); DECLARE_ID (androidBluetoothNeeded); DECLARE_ID (androidMinimumSDK); DECLARE_ID (androidOtherPermissions); diff --git a/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp b/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp index 506038a3..f4359176 100644 --- a/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp +++ b/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp @@ -218,10 +218,10 @@ void StoredSettings::ColourSelectorWithSwatches::setSwatchColour (int index, con } //============================================================================== -static bool doesSDKPathContainFile (const String& path, const String& fileToCheckFor) +static bool doesSDKPathContainFile (const File& relativeTo, const String& path, const String& fileToCheckFor) { String actualPath = path.replace ("${user.home}", File::getSpecialLocation (File::userHomeDirectory).getFullPathName()); - return File::getCurrentWorkingDirectory().getChildFile (actualPath + "/" + fileToCheckFor).existsAsFile(); + return relativeTo.getChildFile (actualPath + "/" + fileToCheckFor).existsAsFile(); } Value StoredSettings::getGlobalPath (const Identifier& key, DependencyPathOS os) @@ -271,7 +271,7 @@ String StoredSettings::getFallbackPath (const Identifier& key, DependencyPathOS return String(); } -bool StoredSettings::isGlobalPathValid (const Identifier& key, const String& path) +bool StoredSettings::isGlobalPathValid (const File& relativeTo, const Identifier& key, const String& path) { String fileToCheckFor; @@ -298,7 +298,7 @@ bool StoredSettings::isGlobalPathValid (const Identifier& key, const String& pat else if (key == Ids::androidNDKPath) { #if JUCE_WINDOWS - fileToCheckFor = "ndk-depends.exe"; + fileToCheckFor = "ndk-depends.cmd"; #else fileToCheckFor = "ndk-depends"; #endif @@ -310,5 +310,5 @@ bool StoredSettings::isGlobalPathValid (const Identifier& key, const String& pat return false; } - return doesSDKPathContainFile (path, fileToCheckFor); + return doesSDKPathContainFile (relativeTo, path, fileToCheckFor); } diff --git a/extras/Projucer/Source/Utility/jucer_StoredSettings.h b/extras/Projucer/Source/Utility/jucer_StoredSettings.h index 136450a6..96ac576d 100644 --- a/extras/Projucer/Source/Utility/jucer_StoredSettings.h +++ b/extras/Projucer/Source/Utility/jucer_StoredSettings.h @@ -67,7 +67,8 @@ public: //============================================================================== Value getGlobalPath (const Identifier& key, DependencyPathOS); String getFallbackPath (const Identifier& key, DependencyPathOS); - bool isGlobalPathValid (const Identifier& key, const String& path); + + bool isGlobalPathValid (const File& relativeTo, const Identifier& key, const String& path); private: OwnedArray propertyFiles; diff --git a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj index 691121de..8000aa60 100644 --- a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj +++ b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ AA207299991F85938465BF65 = {isa = PBXBuildFile; fileRef = 2030A589A9355FE6A0F72428; }; 66FC7F44EEC9044E5C4A21C3 = {isa = PBXBuildFile; fileRef = C0531453A002C480280C5F05; }; 8D51903C59161885903F60CC = {isa = PBXBuildFile; fileRef = 04C1B8BF62AA09E62B362913; }; - 32010EA67EEFE024B9CE1CB5 = {isa = PBXBuildFile; fileRef = B4202EE1243A8FCA29996D05; }; 263250D6F359CE403B0566FF = {isa = PBXBuildFile; fileRef = 8C449538B266A891147103D6; }; 17A09B4AF453B148CD7349F4 = {isa = PBXBuildFile; fileRef = FCB76958E12B2D7F8277CD59; }; DA258437B00E720A6D6A6442 = {isa = PBXBuildFile; fileRef = BE5E66183FBDAED0236061AE; }; @@ -100,7 +99,6 @@ 0EAC6F9BA8425E419F803A2B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioUnitPluginFormat.h"; path = "../../../../modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h"; sourceTree = "SOURCE_ROOT"; }; 0ECFEC85FD0ECE2C9ADFB197 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jdhuff.h; path = "../../../../modules/juce_graphics/image_formats/jpglib/jdhuff.h"; sourceTree = "SOURCE_ROOT"; }; 0F1C7E2100FFAD72CAA23DCB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawableShape.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableShape.h"; sourceTree = "SOURCE_ROOT"; }; - 0F4C3B3BD169BEA4FEC3ED5B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioCDReader.cpp"; path = "../../../../modules/juce_audio_devices/audio_cd/juce_AudioCDReader.cpp"; sourceTree = "SOURCE_ROOT"; }; 0F9A5A14CC510059B9EC4936 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertyPanel.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_PropertyPanel.cpp"; sourceTree = "SOURCE_ROOT"; }; 0FEB81BE044CA9D0C4EA2FB5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = pngrtran.c; path = "../../../../modules/juce_graphics/image_formats/pnglib/pngrtran.c"; sourceTree = "SOURCE_ROOT"; }; 10A61BFCEB2A64AF73F212D1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_graphics.cpp"; path = "../../../../modules/juce_graphics/juce_graphics.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -108,6 +106,7 @@ 118987654CE12CAC784213BB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_gui_basics.cpp"; path = "../../../../modules/juce_gui_basics/juce_gui_basics.cpp"; sourceTree = "SOURCE_ROOT"; }; 11AD5417D0E7C2C1C828838C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XmlElement.h"; path = "../../../../modules/juce_core/xml/juce_XmlElement.h"; sourceTree = "SOURCE_ROOT"; }; 11C847C1E8A88B669765EC78 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLContext.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLContext.cpp"; sourceTree = "SOURCE_ROOT"; }; + 122474A629F551412A66A8ED = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AU_Shared.h"; path = "../../../../modules/juce_audio_processors/format_types/juce_AU_Shared.h"; sourceTree = "SOURCE_ROOT"; }; 130A3006D67DEE7054BBC5B6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XmlDocument.h"; path = "../../../../modules/juce_core/xml/juce_XmlDocument.h"; sourceTree = "SOURCE_ROOT"; }; 136DC9F51F7618E89A87A97D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TextInputTarget.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_TextInputTarget.h"; sourceTree = "SOURCE_ROOT"; }; 1382CD8AF4831CB28EBC85F4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MouseEvent.cpp"; path = "../../../../modules/juce_gui_basics/mouse/juce_MouseEvent.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -442,7 +441,6 @@ 5AFC2E24814619E763458B81 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_audio_processors.mm"; path = "../../JuceLibraryCode/juce_audio_processors.mm"; sourceTree = "SOURCE_ROOT"; }; 5B700FCF685F005DCC46AF6C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioSubsectionReader.h"; path = "../../../../modules/juce_audio_formats/format/juce_AudioSubsectionReader.h"; sourceTree = "SOURCE_ROOT"; }; 5B7207D43E415121202DE038 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Javascript.cpp"; path = "../../../../modules/juce_core/javascript/juce_Javascript.cpp"; sourceTree = "SOURCE_ROOT"; }; - 5B8939FA8DA30BBD5EA2B921 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_AudioCDReader.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_win32_AudioCDReader.cpp"; sourceTree = "SOURCE_ROOT"; }; 5BC25B28965D29BC1BA25BD3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiBuffer.cpp"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiBuffer.cpp"; sourceTree = "SOURCE_ROOT"; }; 5C283446F7FBC70FA2FE526D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; }; 5C7BDD8DF72F2FC2D44D757A = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; }; @@ -487,7 +485,6 @@ 61E6CF3FCBE2484315D9D104 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DropShadowEffect.cpp"; path = "../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"; sourceTree = "SOURCE_ROOT"; }; 623E393A11DA11EB2EE138D6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioFormatWriter.cpp"; path = "../../../../modules/juce_audio_formats/format/juce_AudioFormatWriter.cpp"; sourceTree = "SOURCE_ROOT"; }; 629D51EC5109E8AFCC47A16E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLPixelFormat.h"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLPixelFormat.h"; sourceTree = "SOURCE_ROOT"; }; - 63B4D4DC6722AA8998EAC9B2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AudioCDBurner.mm"; path = "../../../../modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm"; sourceTree = "SOURCE_ROOT"; }; 63DFCDB677B0ABBA832E87D4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ApplicationCommandInfo.cpp"; path = "../../../../modules/juce_gui_basics/commands/juce_ApplicationCommandInfo.cpp"; sourceTree = "SOURCE_ROOT"; }; 63EA6ECB4F56812B02B43B41 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Drawable.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_Drawable.cpp"; sourceTree = "SOURCE_ROOT"; }; 63FE8D20853DE99AAB629474 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectoryIterator.h"; path = "../../../../modules/juce_core/files/juce_DirectoryIterator.h"; sourceTree = "SOURCE_ROOT"; }; @@ -496,12 +493,10 @@ 64599EF94FDACF1384134045 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_GIFLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_GIFLoader.cpp"; sourceTree = "SOURCE_ROOT"; }; 646C61429CD13E2E52D12141 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterprocessConnectionServer.h"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnectionServer.h"; sourceTree = "SOURCE_ROOT"; }; 64CFE2DDF94D6E8B3AE7AEC2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ModalComponentManager.cpp"; path = "../../../../modules/juce_gui_basics/components/juce_ModalComponentManager.cpp"; sourceTree = "SOURCE_ROOT"; }; - 64D9AB699D586EE37F00BB88 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AudioCDReader.mm"; path = "../../../../modules/juce_audio_devices/native/juce_mac_AudioCDReader.mm"; sourceTree = "SOURCE_ROOT"; }; 64E5D55B5B7848BFFE434833 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Uuid.cpp"; path = "../../../../modules/juce_core/misc/juce_Uuid.cpp"; sourceTree = "SOURCE_ROOT"; }; 65316F84E7998071FE57E190 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TimeSliceThread.h"; path = "../../../../modules/juce_core/threads/juce_TimeSliceThread.h"; sourceTree = "SOURCE_ROOT"; }; 6562FCA20B6E1D38DAAF88ED = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_mac_CarbonViewWrapperComponent.h"; path = "../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h"; sourceTree = "SOURCE_ROOT"; }; 657B7282AD450BA17A392C64 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; }; - 657DA6D1CFBC64B658162536 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_AudioCDReader.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_linux_AudioCDReader.cpp"; sourceTree = "SOURCE_ROOT"; }; 65806C148D71B279981B2E6B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGL_linux.h"; path = "../../../../modules/juce_opengl/native/juce_OpenGL_linux.h"; sourceTree = "SOURCE_ROOT"; }; 65AF531F57FA186D14BF991F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TargetPlatform.h"; path = "../../../../modules/juce_core/system/juce_TargetPlatform.h"; sourceTree = "SOURCE_ROOT"; }; 65B2A94615B8FFFBBA894728 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_CameraDevice.mm"; path = "../../../../modules/juce_video/native/juce_mac_CameraDevice.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -596,7 +591,6 @@ 7C29E9FFCFFD30F863DF8E1D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiBuffer.h"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiBuffer.h"; sourceTree = "SOURCE_ROOT"; }; 7C772F83DB2735614565AF24 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Files.mm"; path = "../../../../modules/juce_core/native/juce_mac_Files.mm"; sourceTree = "SOURCE_ROOT"; }; 7C79A6FF6D5806B3B87AA6D5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_FileChooser.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_FileChooser.cpp"; sourceTree = "SOURCE_ROOT"; }; - 7C9012BEBB65383C5FF46E5C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_AudioCDBurner.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp"; sourceTree = "SOURCE_ROOT"; }; 7CBD7946B2E48708A4B9A6CC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MemoryBlock.h"; path = "../../../../modules/juce_core/memory/juce_MemoryBlock.h"; sourceTree = "SOURCE_ROOT"; }; 7CDC6AC64FB463E2E165ECFE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ChannelRemappingAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; }; 7D0870363A15C00C3AEDEB72 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "stream_encoder.h"; path = "../../../../modules/juce_audio_formats/codecs/flac/libFLAC/include/protected/stream_encoder.h"; sourceTree = "SOURCE_ROOT"; }; @@ -608,7 +602,6 @@ 7E8909F2EAEC89A5DDFFE66A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioSampleBuffer.h"; path = "../../../../modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h"; sourceTree = "SOURCE_ROOT"; }; 7EBC05447D1D054C0DE34F3B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HyperlinkButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_HyperlinkButton.h"; sourceTree = "SOURCE_ROOT"; }; 7EBCBDD96E6E70F99719844C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComboBox.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_ComboBox.cpp"; sourceTree = "SOURCE_ROOT"; }; - 7EBE149C4323508FED63DFCC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioCDBurner.h"; path = "../../../../modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h"; sourceTree = "SOURCE_ROOT"; }; 7F8E21473BDFBCFBAF2228EF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jutils.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jutils.c"; sourceTree = "SOURCE_ROOT"; }; 7FDDFE5DEDF1FB4CE9DA3805 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Registry.cpp"; path = "../../../../modules/juce_core/native/juce_win32_Registry.cpp"; sourceTree = "SOURCE_ROOT"; }; 80111753A0AE831424A9F5B8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Label.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_Label.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -628,6 +621,7 @@ 83911624896F5077D1584CE5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PluginDescription.cpp"; path = "../../../../modules/juce_audio_processors/processors/juce_PluginDescription.cpp"; sourceTree = "SOURCE_ROOT"; }; 83C07F8DBFB9A1A73BF0CD79 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RecentlyOpenedFilesList.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp"; sourceTree = "SOURCE_ROOT"; }; 83CAA169494D570CF137600C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = zlib.h; path = "../../../../modules/juce_core/zip/zlib/zlib.h"; sourceTree = "SOURCE_ROOT"; }; + 83F6D00DCD5A0F59DA0173C2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioChannelSet.h"; path = "../../../../modules/juce_audio_basics/buffers/juce_AudioChannelSet.h"; sourceTree = "SOURCE_ROOT"; }; 83FE3FC19E4060EF4B820617 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MouseInputSource.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_MouseInputSource.h"; sourceTree = "SOURCE_ROOT"; }; 846FD9CFF342230F791765DE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentPeer.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_ComponentPeer.cpp"; sourceTree = "SOURCE_ROOT"; }; 8495525D384E30C43C203FAA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CaretComponent.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_CaretComponent.h"; sourceTree = "SOURCE_ROOT"; }; @@ -856,7 +850,6 @@ B38A1AC42B002115350C0268 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; B3AB04FFAF555EF180242F31 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_opengl.mm"; path = "../../../../modules/juce_opengl/juce_opengl.mm"; sourceTree = "SOURCE_ROOT"; }; B4002753D99D947D4198A324 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OutputStream.cpp"; path = "../../../../modules/juce_core/streams/juce_OutputStream.cpp"; sourceTree = "SOURCE_ROOT"; }; - B4202EE1243A8FCA29996D05 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; }; B423B80221F35DE6787F4950 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringRef.h"; path = "../../../../modules/juce_core/text/juce_StringRef.h"; sourceTree = "SOURCE_ROOT"; }; B47394806DDFA3E7800E61B4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Toolbar.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_Toolbar.h"; sourceTree = "SOURCE_ROOT"; }; B48F2BC7D54AB619F94B6DE1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MathsFunctions.h"; path = "../../../../modules/juce_core/maths/juce_MathsFunctions.h"; sourceTree = "SOURCE_ROOT"; }; @@ -903,11 +896,9 @@ BDE2CEC1C2F9C0EA2FDEDEEC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; }; BE3A8E4BAD6D3DD4EB9F77AF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PopupMenu.cpp"; path = "../../../../modules/juce_gui_basics/menus/juce_PopupMenu.cpp"; sourceTree = "SOURCE_ROOT"; }; BE3C6EB9580AFB6A8C731A11 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_InputStream.cpp"; path = "../../../../modules/juce_core/streams/juce_InputStream.cpp"; sourceTree = "SOURCE_ROOT"; }; - BE3EA058010047456D73AACD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioCDReader.h"; path = "../../../../modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h"; sourceTree = "SOURCE_ROOT"; }; BE5E66183FBDAED0236061AE = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; }; BEDCD61FAD477E737E9001FB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LinearSmoothedValue.h"; path = "../../../../modules/juce_audio_basics/effects/juce_LinearSmoothedValue.h"; sourceTree = "SOURCE_ROOT"; }; BEF5F831841B2D82D0F8184D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_gui_extra.cpp"; path = "../../../../modules/juce_gui_extra/juce_gui_extra.cpp"; sourceTree = "SOURCE_ROOT"; }; - BF07F813AE252965882B419D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioChannelSet.h"; path = "../../../../modules/juce_audio_processors/processors/juce_AudioChannelSet.h"; sourceTree = "SOURCE_ROOT"; }; BF4300338A09F8D69332A4FA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdapistd.c; path = "../../../../modules/juce_graphics/image_formats/jpglib/jdapistd.c"; sourceTree = "SOURCE_ROOT"; }; BF7DB7CEEFC788FBAC7DDAFD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../../../modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; }; BF83F16E220BF09C26FD7DA6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ElementComparator.h"; path = "../../../../modules/juce_core/containers/juce_ElementComparator.h"; sourceTree = "SOURCE_ROOT"; }; @@ -931,7 +922,6 @@ C2F2E19D495434FA2DE26CDC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KnownPluginList.cpp"; path = "../../../../modules/juce_audio_processors/scanning/juce_KnownPluginList.cpp"; sourceTree = "SOURCE_ROOT"; }; C38E103566DD334575DEB132 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = format.h; path = "../../../../modules/juce_audio_formats/codecs/flac/format.h"; sourceTree = "SOURCE_ROOT"; }; C3B38FF0CFF855B48FD341D2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_AudioUnitPluginFormat.mm"; path = "../../../../modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm"; sourceTree = "SOURCE_ROOT"; }; - C3FF931ABD1A2A7A0B3F2F32 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioChannelSet.cpp"; path = "../../../../modules/juce_audio_processors/processors/juce_AudioChannelSet.cpp"; sourceTree = "SOURCE_ROOT"; }; C42BCD9C395C1CD9E1207E88 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = "../../../../modules/juce_core/zip/zlib/zutil.c"; sourceTree = "SOURCE_ROOT"; }; C43F3C14D904F5ACD41ADA91 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeParallelogram.h"; path = "../../../../modules/juce_gui_basics/positioning/juce_RelativeParallelogram.h"; sourceTree = "SOURCE_ROOT"; }; C4725A9E883FE9A4BE50D9CA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RSAKey.cpp"; path = "../../../../modules/juce_cryptography/encryption/juce_RSAKey.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -946,6 +936,7 @@ C5E11042008ADD9755FE072F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioPluginFormatManager.h"; path = "../../../../modules/juce_audio_processors/format/juce_AudioPluginFormatManager.h"; sourceTree = "SOURCE_ROOT"; }; C642049FA1163EA7E12E88A3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CoreAudioFormat.cpp"; path = "../../../../modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; C66E703E2D09BB632D602704 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = bitwriter.c; path = "../../../../modules/juce_audio_formats/codecs/flac/libFLAC/bitwriter.c"; sourceTree = "SOURCE_ROOT"; }; + C6D16786DBDCE534E674241F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_VSTCommon.h"; path = "../../../../modules/juce_audio_processors/format_types/juce_VSTCommon.h"; sourceTree = "SOURCE_ROOT"; }; C6FE61439C07717B4A0F9B64 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Whirlpool.cpp"; path = "../../../../modules/juce_cryptography/hashing/juce_Whirlpool.cpp"; sourceTree = "SOURCE_ROOT"; }; C72AFDEA087704F6D67C4D6F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MemoryInputStream.cpp"; path = "../../../../modules/juce_core/streams/juce_MemoryInputStream.cpp"; sourceTree = "SOURCE_ROOT"; }; C7625C0B5AF05F7B34BFA9FD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DeletedAtShutdown.cpp"; path = "../../../../modules/juce_events/messages/juce_DeletedAtShutdown.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1194,6 +1185,7 @@ F94CD18DE8CA9B8252F7BEDA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_GZIPCompressorOutputStream.h"; path = "../../../../modules/juce_core/zip/juce_GZIPCompressorOutputStream.h"; sourceTree = "SOURCE_ROOT"; }; F9532938F368676B0E308A2E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_audio_processors.mm"; path = "../../../../modules/juce_audio_processors/juce_audio_processors.mm"; sourceTree = "SOURCE_ROOT"; }; F98B3688EA63D8E635D2CC43 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LowLevelGraphicsContext.h"; path = "../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"; sourceTree = "SOURCE_ROOT"; }; + F9C7F1AAAD6469FB3100D949 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioChannelSet.cpp"; path = "../../../../modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp"; sourceTree = "SOURCE_ROOT"; }; F9CF000B7EF51FF75DC39F02 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = envelope.h; path = "../../../../modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/envelope.h"; sourceTree = "SOURCE_ROOT"; }; F9CF1242078815002E111C9D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AffineTransform.cpp"; path = "../../../../modules/juce_graphics/geometry/juce_AffineTransform.cpp"; sourceTree = "SOURCE_ROOT"; }; FA3830ED7B86B0B1FB5AD8F8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OggVorbisAudioFormat.cpp"; path = "../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1223,6 +1215,8 @@ 88C22F995571E4A515721154 = {isa = PBXGroup; children = ( 9E7E99EBD6772DAF4725435D, ); name = UnitTestRunner; sourceTree = ""; }; 0D65DC6399D4325C97F412F8 = {isa = PBXGroup; children = ( + F9C7F1AAAD6469FB3100D949, + 83F6D00DCD5A0F59DA0173C2, 3119FD9D68523225E7F0D144, 4B26E321B9E1B5C873CDA2C7, 7E8909F2EAEC89A5DDFFE66A, @@ -1303,11 +1297,7 @@ B2B2B0D649F7F56CA1204146, 8A9BF66CD7A1500F21F06CF6, B2B2B0D649F7F56CA1204146, ); name = "juce_audio_basics"; sourceTree = ""; }; - 7008BEA3127B09C4E9C2DC85 = {isa = PBXGroup; children = ( - 7EBE149C4323508FED63DFCC, - 0F4C3B3BD169BEA4FEC3ED5B, - BE3EA058010047456D73AACD, ); name = "audio_cd"; sourceTree = ""; }; - B55CD0ABA133DB18FF729942 = {isa = PBXGroup; children = ( + F0324274006181AD9A3854F9 = {isa = PBXGroup; children = ( A0B818539943BFCEA1AA2C1E, 57272E091C29E8475D3779E7, B2AA22B23779CE171655790B, @@ -1315,7 +1305,7 @@ F56A0572594B18C198211C87, D9CAFE63130B829FB4912923, D851AB2AA2C9828AAA4DEDB1, ); name = "audio_io"; sourceTree = ""; }; - 185F03410F35E07C7AE25C16 = {isa = PBXGroup; children = ( + 97757207AEA4E4141CA09FA6 = {isa = PBXGroup; children = ( ECCBD88AAED3D911C98AD253, 871B5D88E335FFCEB530FEF0, E37854E5BF8CA5BD430A5120, @@ -1327,31 +1317,25 @@ 8C8A49AE954E8C36615536F6, 8161DCC2C337E618F1730DAA, 85F802EFFDC257863FFC44AE, - 657DA6D1CFBC64B658162536, F2864445B36DDDF9BC726F09, 4AED4B9B50A5A3FFDBAAAEF2, - 63B4D4DC6722AA8998EAC9B2, - 64D9AB699D586EE37F00BB88, 86835EA6C418B4F10885B612, 91084A9A4037F73105EBCFF2, 968B88C717F0943290B811AC, 43E68AD12B0E124A817BCFE4, - 7C9012BEBB65383C5FF46E5C, - 5B8939FA8DA30BBD5EA2B921, 46240849FADC744B37AB1CE4, B5CE09DCE9500F96794A366F, 759298E5BD13DF0FEA4BBC71, ); name = native; sourceTree = ""; }; - 25F6F8EFD788A511DE3BC9D2 = {isa = PBXGroup; children = ( + 2832733C2E183A16CCB5B344 = {isa = PBXGroup; children = ( B2DCDC3D189A0973286F250A, 0842DF7979CB25F708597440, F669B4CA3F8E8822FE761FCC, 7A018DFF9F04FB1C930EEC9E, ); name = sources; sourceTree = ""; }; CB31FFDD38E416ACDECBA7B8 = {isa = PBXGroup; children = ( - 7008BEA3127B09C4E9C2DC85, - B55CD0ABA133DB18FF729942, - 185F03410F35E07C7AE25C16, + F0324274006181AD9A3854F9, + 97757207AEA4E4141CA09FA6, BB2E281E195F9F1AAE9056CE, - 25F6F8EFD788A511DE3BC9D2, + 2832733C2E183A16CCB5B344, 8EA39C48DA182B4CD06FE4D0, 284376DCD46CCD8879477F8C, B2B8E7BE0607DA166DAAEFEF, @@ -1549,12 +1533,13 @@ D3B67F76F3E120815C1B3729, B114804B7D23DA65A2A6351A, D3B67F76F3E120815C1B3729, ); name = "juce_audio_formats"; sourceTree = ""; }; - 8736C0529FA9C2C32A98764D = {isa = PBXGroup; children = ( + 0F8790396D2C77037F870ED6 = {isa = PBXGroup; children = ( 345459CE27D07EDD3E19B299, DC6B27F5C167FD13C2C903B5, 82C1F8A9929DF547C004C07F, C5E11042008ADD9755FE072F, ); name = format; sourceTree = ""; }; - ABF2AF74BF7080092729FB97 = {isa = PBXGroup; children = ( + BB063BC4206A502F6F09B13B = {isa = PBXGroup; children = ( + 122474A629F551412A66A8ED, 0EAC6F9BA8425E419F803A2B, C3B38FF0CFF855B48FD341D2, 54BF97F32965B4FB5CF2D56F, @@ -1563,13 +1548,12 @@ E7153B9DA221B856B57005B2, 458AFB04FC657C0B8E140C57, D42D77C52B0B860D000123A7, + C6D16786DBDCE534E674241F, 16CA9656E3C51EFD0962ABC4, E51C2746AF287DBC983CAF65, E3D8F97C26B8E03820AFC971, 763A365B46F5D3EDD8F8B1EF, ); name = "format_types"; sourceTree = ""; }; - 158CACD42A1CC66D5423F77A = {isa = PBXGroup; children = ( - C3FF931ABD1A2A7A0B3F2F32, - BF07F813AE252965882B419D, + 96B6B1F3563E2A356872507D = {isa = PBXGroup; children = ( 59EE21D372B3DFC1B453B8B4, 7BC436F55CA94D4ED0A20BC6, 468EE2A5579D7F6508B3BE7F, @@ -1601,9 +1585,9 @@ A413B2A303984674A412461B, AB22692A2D791A3D54D8C032, ); name = utilities; sourceTree = ""; }; 67E024FB39CF9D5F419DFBF5 = {isa = PBXGroup; children = ( - 8736C0529FA9C2C32A98764D, - ABF2AF74BF7080092729FB97, - 158CACD42A1CC66D5423F77A, + 0F8790396D2C77037F870ED6, + BB063BC4206A502F6F09B13B, + 96B6B1F3563E2A356872507D, B38FEF84E3189E32B3A795A7, 4661CAE20E855F3E2858F466, 5855D3234BC62C85FAD56651, @@ -2643,7 +2627,6 @@ 2030A589A9355FE6A0F72428, C0531453A002C480280C5F05, 04C1B8BF62AA09E62B362913, - B4202EE1243A8FCA29996D05, 8C449538B266A891147103D6, FCB76958E12B2D7F8277CD59, BE5E66183FBDAED0236061AE, @@ -2770,7 +2753,6 @@ AA207299991F85938465BF65, 66FC7F44EEC9044E5C4A21C3, 8D51903C59161885903F60CC, - 32010EA67EEFE024B9CE1CB5, 263250D6F359CE403B0566FF, 17A09B4AF453B148CD7349F4, DA258437B00E720A6D6A6442, diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.vcxproj index 8bfa5732..4643ca64 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.vcxproj @@ -130,6 +130,9 @@ + + true + true @@ -220,9 +223,6 @@ true - - true - true @@ -253,9 +253,6 @@ true - - true - true @@ -271,12 +268,6 @@ true - - true - - - true - true @@ -481,9 +472,6 @@ true - - true - true @@ -1697,6 +1685,7 @@ + @@ -1734,8 +1723,6 @@ - - @@ -1850,15 +1837,16 @@ + + - diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.vcxproj.filters index 98d585b9..e4bcc85c 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner.vcxproj.filters @@ -35,9 +35,6 @@ {CACD7B50-4DB3-76AF-A6E8-90DF94F8F594} - - {45C2CE26-EC4B-BA52-58F3-297C408E1483} - {9D270B31-2425-8FDB-84A4-6A2288FF5B2F} @@ -364,6 +361,9 @@ UnitTestRunner\Source + + Juce Modules\juce_audio_basics\buffers + Juce Modules\juce_audio_basics\buffers @@ -457,9 +457,6 @@ Juce Modules\juce_audio_basics - - Juce Modules\juce_audio_devices\audio_cd - Juce Modules\juce_audio_devices\audio_io @@ -490,21 +487,12 @@ Juce Modules\juce_audio_devices\native - - Juce Modules\juce_audio_devices\native - Juce Modules\juce_audio_devices\native Juce Modules\juce_audio_devices\native - - Juce Modules\juce_audio_devices\native - - - Juce Modules\juce_audio_devices\native - Juce Modules\juce_audio_devices\native @@ -514,12 +502,6 @@ Juce Modules\juce_audio_devices\native - - Juce Modules\juce_audio_devices\native - - - Juce Modules\juce_audio_devices\native - Juce Modules\juce_audio_devices\native @@ -733,9 +715,6 @@ Juce Modules\juce_audio_processors\format_types - - Juce Modules\juce_audio_processors\processors - Juce Modules\juce_audio_processors\processors @@ -2073,6 +2052,9 @@ + + Juce Modules\juce_audio_basics\buffers + Juce Modules\juce_audio_basics\buffers @@ -2184,12 +2166,6 @@ Juce Modules\juce_audio_basics - - Juce Modules\juce_audio_devices\audio_cd - - - Juce Modules\juce_audio_devices\audio_cd - Juce Modules\juce_audio_devices\audio_io @@ -2532,6 +2508,9 @@ Juce Modules\juce_audio_processors\format + + Juce Modules\juce_audio_processors\format_types + Juce Modules\juce_audio_processors\format_types @@ -2547,6 +2526,9 @@ Juce Modules\juce_audio_processors\format_types + + Juce Modules\juce_audio_processors\format_types + Juce Modules\juce_audio_processors\format_types @@ -2556,9 +2538,6 @@ Juce Modules\juce_audio_processors\format_types - - Juce Modules\juce_audio_processors\processors - Juce Modules\juce_audio_processors\processors diff --git a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h index 400560f9..ff66a9d7 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h +++ b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h @@ -79,14 +79,6 @@ //#define JUCE_USE_ANDROID_OPENSLES #endif -#ifndef JUCE_USE_CDREADER - //#define JUCE_USE_CDREADER -#endif - -#ifndef JUCE_USE_CDBURNER - //#define JUCE_USE_CDBURNER -#endif - //============================================================================== // juce_audio_formats flags: diff --git a/extras/UnitTestRunner/UnitTestRunner.jucer b/extras/UnitTestRunner/UnitTestRunner.jucer index fe6b5ba5..a08a615e 100644 --- a/extras/UnitTestRunner/UnitTestRunner.jucer +++ b/extras/UnitTestRunner/UnitTestRunner.jucer @@ -2,7 +2,7 @@ + jucerVersion="4.3.0" defines="JUCE_UNIT_TESTS=1"> diff --git a/extras/binarybuilder/BinaryBuilder.jucer b/extras/binarybuilder/BinaryBuilder.jucer index 35fe457d..18d964e1 100644 --- a/extras/binarybuilder/BinaryBuilder.jucer +++ b/extras/binarybuilder/BinaryBuilder.jucer @@ -1,7 +1,7 @@ + + true + true @@ -213,9 +216,6 @@ true - - true - true @@ -246,9 +246,6 @@ true - - true - true @@ -264,12 +261,6 @@ true - - true - - - true - true @@ -474,9 +465,6 @@ true - - true - true @@ -510,6 +498,9 @@ true + + true + true @@ -531,15 +522,27 @@ true + + true + true true + + true + + + true + true + + true + true @@ -1696,6 +1699,7 @@ + @@ -1733,8 +1737,6 @@ - - @@ -1849,15 +1851,16 @@ + + - @@ -1878,6 +1881,8 @@ + + @@ -1887,6 +1892,7 @@ + diff --git a/extras/windows dll/Builds/VisualStudio2010/juce_dll.vcxproj.filters b/extras/windows dll/Builds/VisualStudio2010/juce_dll.vcxproj.filters index b4065dfa..362f0cc8 100644 --- a/extras/windows dll/Builds/VisualStudio2010/juce_dll.vcxproj.filters +++ b/extras/windows dll/Builds/VisualStudio2010/juce_dll.vcxproj.filters @@ -35,9 +35,6 @@ {CACD7B50-4DB3-76AF-A6E8-90DF94F8F594} - - {45C2CE26-EC4B-BA52-58F3-297C408E1483} - {9D270B31-2425-8FDB-84A4-6A2288FF5B2F} @@ -122,6 +119,9 @@ {B63F69FD-8A40-8E1E-E7ED-419B8DC1C12B} + + {C396369E-8C55-88E9-5D19-5D3772B773D3} + {8167E753-09C7-5D1C-EF2B-32D297557443} @@ -367,6 +367,9 @@ + + Juce Modules\juce_audio_basics\buffers + Juce Modules\juce_audio_basics\buffers @@ -460,9 +463,6 @@ Juce Modules\juce_audio_basics - - Juce Modules\juce_audio_devices\audio_cd - Juce Modules\juce_audio_devices\audio_io @@ -493,21 +493,12 @@ Juce Modules\juce_audio_devices\native - - Juce Modules\juce_audio_devices\native - Juce Modules\juce_audio_devices\native Juce Modules\juce_audio_devices\native - - Juce Modules\juce_audio_devices\native - - - Juce Modules\juce_audio_devices\native - Juce Modules\juce_audio_devices\native @@ -517,12 +508,6 @@ Juce Modules\juce_audio_devices\native - - Juce Modules\juce_audio_devices\native - - - Juce Modules\juce_audio_devices\native - Juce Modules\juce_audio_devices\native @@ -736,9 +721,6 @@ Juce Modules\juce_audio_processors\format_types - - Juce Modules\juce_audio_processors\processors - Juce Modules\juce_audio_processors\processors @@ -775,6 +757,9 @@ Juce Modules\juce_audio_processors + + Juce Modules\juce_audio_utils\audio_cd + Juce Modules\juce_audio_utils\gui @@ -799,18 +784,36 @@ Juce Modules\juce_audio_utils\native + + Juce Modules\juce_audio_utils\native + Juce Modules\juce_audio_utils\native + + Juce Modules\juce_audio_utils\native + + + Juce Modules\juce_audio_utils\native + Juce Modules\juce_audio_utils\native Juce Modules\juce_audio_utils\native + + Juce Modules\juce_audio_utils\native + + + Juce Modules\juce_audio_utils\native + Juce Modules\juce_audio_utils\players + + Juce Modules\juce_audio_utils\players + Juce Modules\juce_audio_utils @@ -2091,6 +2094,9 @@ + + Juce Modules\juce_audio_basics\buffers + Juce Modules\juce_audio_basics\buffers @@ -2202,12 +2208,6 @@ Juce Modules\juce_audio_basics - - Juce Modules\juce_audio_devices\audio_cd - - - Juce Modules\juce_audio_devices\audio_cd - Juce Modules\juce_audio_devices\audio_io @@ -2550,6 +2550,9 @@ Juce Modules\juce_audio_processors\format + + Juce Modules\juce_audio_processors\format_types + Juce Modules\juce_audio_processors\format_types @@ -2565,6 +2568,9 @@ Juce Modules\juce_audio_processors\format_types + + Juce Modules\juce_audio_processors\format_types + Juce Modules\juce_audio_processors\format_types @@ -2574,9 +2580,6 @@ Juce Modules\juce_audio_processors\format_types - - Juce Modules\juce_audio_processors\processors - Juce Modules\juce_audio_processors\processors @@ -2637,6 +2640,12 @@ Juce Modules\juce_audio_processors + + Juce Modules\juce_audio_utils\audio_cd + + + Juce Modules\juce_audio_utils\audio_cd + Juce Modules\juce_audio_utils\gui @@ -2664,6 +2673,9 @@ Juce Modules\juce_audio_utils\players + + Juce Modules\juce_audio_utils\players + Juce Modules\juce_audio_utils diff --git a/extras/windows dll/JuceLibraryCode/AppConfig.h b/extras/windows dll/JuceLibraryCode/AppConfig.h index 7fc1d5e2..c84981f2 100644 --- a/extras/windows dll/JuceLibraryCode/AppConfig.h +++ b/extras/windows dll/JuceLibraryCode/AppConfig.h @@ -79,14 +79,6 @@ //#define JUCE_USE_ANDROID_OPENSLES #endif -#ifndef JUCE_USE_CDREADER - //#define JUCE_USE_CDREADER -#endif - -#ifndef JUCE_USE_CDBURNER - //#define JUCE_USE_CDBURNER -#endif - //============================================================================== // juce_audio_formats flags: @@ -125,6 +117,17 @@ //#define JUCE_PLUGINHOST_AU #endif +//============================================================================== +// juce_audio_utils flags: + +#ifndef JUCE_USE_CDREADER + //#define JUCE_USE_CDREADER +#endif + +#ifndef JUCE_USE_CDBURNER + //#define JUCE_USE_CDBURNER +#endif + //============================================================================== // juce_core flags: diff --git a/extras/windows dll/jucedll.jucer b/extras/windows dll/jucedll.jucer index 88dcba0e..7026f3db 100644 --- a/extras/windows dll/jucedll.jucer +++ b/extras/windows dll/jucedll.jucer @@ -2,7 +2,7 @@ + jucerVersion="4.3.0" defines="JUCE_DLL_BUILD=1" includeBinaryInAppConfig="1"> diff --git a/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp b/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp new file mode 100644 index 00000000..8cfaa300 --- /dev/null +++ b/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp @@ -0,0 +1,336 @@ +/* + ============================================================================== + + This file is part of the JUCE library. + Copyright (c) 2015 - ROLI Ltd. + + Permission is granted to use this software under the terms of either: + a) the GPL v2 (or any later version) + b) the Affero GPL v3 + + Details of these licenses can be found at: www.gnu.org/licenses + + JUCE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.juce.com for more information. + + ============================================================================== +*/ + +AudioChannelSet::AudioChannelSet (uint32 c) : channels (c) {} + +bool AudioChannelSet::operator== (const AudioChannelSet& other) const noexcept { return channels == other.channels; } +bool AudioChannelSet::operator!= (const AudioChannelSet& other) const noexcept { return channels != other.channels; } +bool AudioChannelSet::operator< (const AudioChannelSet& other) const noexcept { return channels < other.channels; } + +String AudioChannelSet::getChannelTypeName (AudioChannelSet::ChannelType type) +{ + if (type >= discreteChannel0) + return String ("Discrete ") + String (type - discreteChannel0 + 1); + + switch (type) + { + case left: return NEEDS_TRANS("Left"); + case right: return NEEDS_TRANS("Right"); + case centre: return NEEDS_TRANS("Centre"); + case LFE: return NEEDS_TRANS("LFE"); + case leftSurround: return NEEDS_TRANS("Left Surround"); + case rightSurround: return NEEDS_TRANS("Right Surround"); + case leftCentre: return NEEDS_TRANS("Left Centre"); + case rightCentre: return NEEDS_TRANS("Right Centre"); + case centreSurround: return NEEDS_TRANS("Centre Surround"); + case leftSurroundRear: return NEEDS_TRANS("Left Surround Rear"); + case rightSurroundRear: return NEEDS_TRANS("Right Surround Rear"); + case topMiddle: return NEEDS_TRANS("Top Middle"); + case topFrontLeft: return NEEDS_TRANS("Top Front Left"); + case topFrontCentre: return NEEDS_TRANS("Top Front Centre"); + case topFrontRight: return NEEDS_TRANS("Top Front Right"); + case topRearLeft: return NEEDS_TRANS("Top Rear Left"); + case topRearCentre: return NEEDS_TRANS("Top Rear Centre"); + case topRearRight: return NEEDS_TRANS("Top Rear Right"); + case wideLeft: return NEEDS_TRANS("Wide Left"); + case wideRight: return NEEDS_TRANS("Wide Right"); + case LFE2: return NEEDS_TRANS("LFE 2"); + case leftSurroundSide: return NEEDS_TRANS ("Left Surround Side"); + case rightSurroundSide: return NEEDS_TRANS ("Right Surround Side"); + case ambisonicW: return NEEDS_TRANS("Ambisonic W"); + case ambisonicX: return NEEDS_TRANS("Ambisonic X"); + case ambisonicY: return NEEDS_TRANS("Ambisonic Y"); + case ambisonicZ: return NEEDS_TRANS("Ambisonic Z"); + default: break; + } + + return "Unknown"; +} + +String AudioChannelSet::getAbbreviatedChannelTypeName (AudioChannelSet::ChannelType type) +{ + if (type >= discreteChannel0) + return String (type - discreteChannel0 + 1); + + switch (type) + { + case left: return "L"; + case right: return "R"; + case centre: return "C"; + case LFE: return "Lfe"; + case leftSurround: return "Ls"; + case rightSurround: return "Rs"; + case leftCentre: return "Lc"; + case rightCentre: return "Rc"; + case centreSurround: return "Cs"; + case leftSurroundRear: return "Lrs"; + case rightSurroundRear: return "Rrs"; + case topMiddle: return "Tm"; + case topFrontLeft: return "Tfl"; + case topFrontCentre: return "Tfc"; + case topFrontRight: return "Tfr"; + case topRearLeft: return "Trl"; + case topRearCentre: return "Trc"; + case topRearRight: return "Trr"; + case wideLeft: return "Wl"; + case wideRight: return "Wr"; + case LFE2: return "Lfe2"; + case leftSurroundSide: return "Lss"; + case rightSurroundSide: return "Rss"; + case ambisonicW: return "W"; + case ambisonicX: return "X"; + case ambisonicY: return "Y"; + case ambisonicZ: return "Z"; + default: break; + } + + return ""; +} + +String AudioChannelSet::getSpeakerArrangementAsString() const +{ + StringArray speakerTypes; + Array speakers = getChannelTypes(); + + for (int i = 0; i < speakers.size(); ++i) + { + String name = getAbbreviatedChannelTypeName (speakers.getReference (i)); + + if (name.isNotEmpty()) + speakerTypes.add (name); + } + + return speakerTypes.joinIntoString (" "); +} + +String AudioChannelSet::getDescription() const +{ + if (isDiscreteLayout()) return String ("Discrete #") + String (size()); + if (*this == disabled()) return "Disabled"; + if (*this == mono()) return "Mono"; + if (*this == stereo()) return "Stereo"; + + if (*this == createLCR()) return "LCR"; + if (*this == createLRS()) return "LRS"; + if (*this == createLCRS()) return "LCRS"; + + if (*this == create5point0()) return "5.1 Surround"; + if (*this == create5point1()) return "5.1 Surround (+Lfe)"; + if (*this == create6point0()) return "6.1 Surround"; + if (*this == create6point1()) return "6.1 Surround (+Lfe)"; + if (*this == create6point0Music()) return "6.1 (Music) Surround"; + if (*this == create6point1Music()) return "6.1 (Music) Surround (+Lfe)"; + if (*this == create7point0()) return "7.1 Surround"; + if (*this == create7point1()) return "7.1 Surround (Lfe)"; + if (*this == create7point0SDDS()) return "7.1 Surround SDDS"; + if (*this == create7point1SDDS()) return "7.1 Surround SDDS (+Lfe)"; + + if (*this == quadraphonic()) return "Quadraphonic"; + if (*this == pentagonal()) return "Pentagonal"; + if (*this == hexagonal()) return "Hexagonal"; + if (*this == octagonal()) return "Octagonal"; + if (*this == ambisonic()) return "Ambisonic"; + + + + return "Unknown"; +} + +bool AudioChannelSet::isDiscreteLayout() const noexcept +{ + Array speakers = getChannelTypes(); + for (int i = 0; i < speakers.size(); ++i) + if (speakers.getReference (i) > ambisonicZ) + return true; + + return false; +} + +int AudioChannelSet::size() const noexcept +{ + return channels.countNumberOfSetBits(); +} + +AudioChannelSet::ChannelType AudioChannelSet::getTypeOfChannel (int index) const noexcept +{ + int bit = channels.findNextSetBit(0); + + for (int i = 0; i < index && bit >= 0; ++i) + bit = channels.findNextSetBit (bit + 1); + + return static_cast (bit); +} + +int AudioChannelSet::getChannelIndexForType (AudioChannelSet::ChannelType type) const noexcept +{ + int idx = 0; + for (int bit = channels.findNextSetBit (0); bit >= 0; bit = channels.findNextSetBit (bit + 1)) + { + if (static_cast (bit) == type) + return idx; + + idx++; + } + + return -1; +} + +Array AudioChannelSet::getChannelTypes() const +{ + Array result; + + for (int bit = channels.findNextSetBit(0); bit >= 0; bit = channels.findNextSetBit (bit + 1)) + result.add (static_cast (bit)); + + return result; +} + +void AudioChannelSet::addChannel (ChannelType newChannel) +{ + const int bit = static_cast (newChannel); + jassert (bit >= 0 && bit < 1024); + channels.setBit (bit); +} + +void AudioChannelSet::removeChannel (ChannelType newChannel) +{ + const int bit = static_cast (newChannel); + jassert (bit >= 0 && bit < 1024); + channels.clearBit (bit); +} + +AudioChannelSet AudioChannelSet::disabled() { return AudioChannelSet(); } +AudioChannelSet AudioChannelSet::mono() { return AudioChannelSet (1u << centre); } +AudioChannelSet AudioChannelSet::stereo() { return AudioChannelSet ((1u << left) | (1u << right)); } +AudioChannelSet AudioChannelSet::createLCR() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << centre)); } +AudioChannelSet AudioChannelSet::createLRS() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << surround)); } +AudioChannelSet AudioChannelSet::createLCRS() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << centre) | (1u << surround)); } +AudioChannelSet AudioChannelSet::create5point0() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << centre) | (1u << leftSurround) | (1u << rightSurround)); } +AudioChannelSet AudioChannelSet::create5point1() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << centre) | (1u << leftSurround) | (1u << rightSurround) | (1u << LFE)); } +AudioChannelSet AudioChannelSet::create6point0() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << centre) | (1u << leftSurround) | (1u << rightSurround) | (1u << centreSurround)); } +AudioChannelSet AudioChannelSet::create6point1() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << centre) | (1u << leftSurround) | (1u << rightSurround) | (1u << centreSurround) | (1u << LFE)); } +AudioChannelSet AudioChannelSet::create6point0Music() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << leftSurround) | (1u << rightSurround) | (1u << leftSurroundSide) | (1u << rightSurroundSide)); } +AudioChannelSet AudioChannelSet::create6point1Music() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << leftSurround) | (1u << rightSurround) | (1u << leftSurroundSide) | (1u << rightSurroundSide) | (1u << LFE)); } +AudioChannelSet AudioChannelSet::create7point0() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << centre) | (1u << leftSurroundSide) | (1u << rightSurroundSide) | (1u << leftSurroundRear) | (1u << rightSurroundRear)); } +AudioChannelSet AudioChannelSet::create7point0SDDS() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << centre) | (1u << leftSurround) | (1u << rightSurround) | (1u << leftCentre) | (1u << rightCentre)); } +AudioChannelSet AudioChannelSet::create7point1() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << centre) | (1u << leftSurroundSide) | (1u << rightSurroundSide) | (1u << leftSurroundRear) | (1u << rightSurroundRear) | (1u << LFE)); } +AudioChannelSet AudioChannelSet::create7point1SDDS() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << centre) | (1u << leftSurround) | (1u << rightSurround) | (1u << leftCentre) | (1u << rightCentre) | (1u << LFE)); } +AudioChannelSet AudioChannelSet::ambisonic() { return AudioChannelSet ((1u << ambisonicW) | (1u << ambisonicX) | (1u << ambisonicY) | (1u << ambisonicZ)); } +AudioChannelSet AudioChannelSet::quadraphonic() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << leftSurround) | (1u << rightSurround)); } +AudioChannelSet AudioChannelSet::pentagonal() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << centre) | (1u << leftSurroundRear) | (1u << rightSurroundRear)); } +AudioChannelSet AudioChannelSet::hexagonal() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << leftSurroundRear) | (1u << rightSurroundRear) | (1u << centre) | (1u << centreSurround)); } +AudioChannelSet AudioChannelSet::octagonal() { return AudioChannelSet ((1u << left) | (1u << right) | (1u << leftSurround) | (1u << rightSurround) | (1u << centre) | (1u << centreSurround) | (1u << wideLeft) | (1u << wideRight)); } + + +AudioChannelSet AudioChannelSet::discreteChannels (int numChannels) +{ + AudioChannelSet s; + s.channels.setRange (discreteChannel0, numChannels, true); + return s; +} + +AudioChannelSet AudioChannelSet::canonicalChannelSet (int numChannels) +{ + if (numChannels == 1) return AudioChannelSet::mono(); + if (numChannels == 2) return AudioChannelSet::stereo(); + if (numChannels == 3) return AudioChannelSet::createLCR(); + if (numChannels == 4) return AudioChannelSet::quadraphonic(); + if (numChannels == 5) return AudioChannelSet::create5point0(); + if (numChannels == 6) return AudioChannelSet::create5point1(); + if (numChannels == 7) return AudioChannelSet::create7point0(); + if (numChannels == 8) return AudioChannelSet::create7point1(); + + return discreteChannels (numChannels); +} + +AudioChannelSet AudioChannelSet::namedChannelSet (int numChannels) +{ + if (numChannels == 1) return AudioChannelSet::mono(); + if (numChannels == 2) return AudioChannelSet::stereo(); + if (numChannels == 3) return AudioChannelSet::createLCR(); + if (numChannels == 4) return AudioChannelSet::quadraphonic(); + if (numChannels == 5) return AudioChannelSet::create5point0(); + if (numChannels == 6) return AudioChannelSet::create5point1(); + if (numChannels == 7) return AudioChannelSet::create7point0(); + if (numChannels == 8) return AudioChannelSet::create7point1(); + + return AudioChannelSet(); +} + +Array AudioChannelSet::channelSetsWithNumberOfChannels (int numChannels) +{ + Array retval; + + if (numChannels != 0) + { + retval.add (AudioChannelSet::discreteChannels (numChannels)); + + if (numChannels == 1) + { + retval.add (AudioChannelSet::mono()); + } + else if (numChannels == 2) + { + retval.add (AudioChannelSet::stereo()); + } + else if (numChannels == 3) + { + retval.add (AudioChannelSet::createLCR()); + retval.add (AudioChannelSet::createLRS()); + } + else if (numChannels == 4) + { + retval.add (AudioChannelSet::quadraphonic()); + retval.add (AudioChannelSet::createLCRS()); + retval.add (AudioChannelSet::ambisonic()); + } + else if (numChannels == 5) + { + retval.add (AudioChannelSet::create5point0()); + retval.add (AudioChannelSet::pentagonal()); + } + else if (numChannels == 6) + { + retval.add (AudioChannelSet::create5point1()); + retval.add (AudioChannelSet::create6point0()); + retval.add (AudioChannelSet::create6point0Music()); + retval.add (AudioChannelSet::hexagonal()); + } + else if (numChannels == 7) + { + retval.add (AudioChannelSet::create7point0()); + retval.add (AudioChannelSet::create7point0SDDS()); + retval.add (AudioChannelSet::create6point1()); + retval.add (AudioChannelSet::create6point1Music()); + } + else if (numChannels == 8) + { + retval.add (AudioChannelSet::create7point1()); + retval.add (AudioChannelSet::create7point1SDDS()); + retval.add (AudioChannelSet::octagonal()); + } + } + + return retval; +} diff --git a/modules/juce_audio_basics/buffers/juce_AudioChannelSet.h b/modules/juce_audio_basics/buffers/juce_AudioChannelSet.h new file mode 100644 index 00000000..c4c9274c --- /dev/null +++ b/modules/juce_audio_basics/buffers/juce_AudioChannelSet.h @@ -0,0 +1,361 @@ +/* + ============================================================================== + + This file is part of the JUCE library. + Copyright (c) 2015 - ROLI Ltd. + + Permission is granted to use this software under the terms of either: + a) the GPL v2 (or any later version) + b) the Affero GPL v3 + + Details of these licenses can be found at: www.gnu.org/licenses + + JUCE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.juce.com for more information. + + ============================================================================== +*/ + +#ifndef JUCE_AUDIOCHANNELSET_H_INCLUDED +#define JUCE_AUDIOCHANNELSET_H_INCLUDED + + +//============================================================================== +/** + Represents a set of audio channel types. + + For example, you might have a set of left + right channels, which is a stereo + channel set. It is a collection of values from the AudioChannelSet::ChannelType + enum, where each type may only occur once within the set. + + The documentation below lists which AudioChannelSet corresponds to which native + layouts used by AAX, VST2/VST3 and CoreAudio/AU. The layout tags in CoreAudio + are particularly confusing. For example, the layout which is labeled as "7.1 SDDS" + in Logic Pro, corresponds to CoreAudio/AU's kAudioChannelLayoutTag_DTS_7_0 tag, whereas + AAX's DTS 7.1 Layout corresponds to CoreAudio/AU's + kAudioChannelLayoutTag_MPEG_7_1_A format, etc. Please do not use the CoreAudio tag + as an indication to the actual layout of the speakers. + + @see Bus +*/ +class JUCE_API AudioChannelSet +{ +public: + /** Creates an empty channel set. + You can call addChannel to add channels to the set. + */ + AudioChannelSet() noexcept {} + + /** Creates a zero-channel set which can be used to indicate that a + bus is disabled. */ + static AudioChannelSet disabled(); + + //============================================================================== + /** Creates a one-channel mono set (centre). + + Is equivalent to: kMonoAAX (VST), AAX_eStemFormat_Mono (AAX), kAudioChannelLayoutTag_Mono (CoreAudio) + */ + static AudioChannelSet mono(); + + + /** Creates a set containing a stereo set (left, right). + + Is equivalent to: kStereo (VST), AAX_eStemFormat_Stereo (AAX), kAudioChannelLayoutTag_Stereo (CoreAudio) + */ + static AudioChannelSet stereo(); + + + //============================================================================== + /** Creates a set containing an LCR set (left, right, centre). + + Is equivalent to: k30Cine (VST), AAX_eStemFormat_LCR (AAX), kAudioChannelLayoutTag_MPEG_3_0_A (CoreAudio) + + This format is referred to as "LRC" in Cubase. + This format is referred to as "LCR" in Pro Tools. + */ + static AudioChannelSet createLCR(); + + + /** Creates a set containing an LRS set (left, right, surround). + + Is equivalent to: k30Music (VST), n/a (AAX), kAudioChannelLayoutTag_ITU_2_1 (CoreAudio) + + This format is referred to as "LRS" in Cubase. + */ + static AudioChannelSet createLRS(); + + + /** Creates a set containing an LCRS set (left, right, centre, surround). + + Is equivalent to: k40Cine (VST), AAX_eStemFormat_LCRS (AAX), kAudioChannelLayoutTag_MPEG_4_0_A (CoreAudio) + + This format is referred to as "LCRS (Pro Logic)" in Logic Pro. + This format is referred to as "LRCS" in Cubase. + This format is referred to as "LCRS" in Pro Tools. + */ + static AudioChannelSet createLCRS(); + + + //============================================================================== + /** Creates a set for a 5.0 surround setup (left, right, centre, leftSurround, rightSurround). + + Is equivalent to: k50 (VST), AAX_eStemFormat_5_0 (AAX), kAudioChannelLayoutTag_MPEG_5_0_A (CoreAudio) + + This format is referred to as "5.0" in Cubase. + This format is referred to as "5.0" in Pro Tools. + */ + static AudioChannelSet create5point0(); + + + /** Creates a set for a 5.1 surround setup (left, right, centre, leftSurround, rightSurround, LFE). + + Is equivalent to: k51 (VST), AAX_eStemFormat_5_1 (AAX), kAudioChannelLayoutTag_MPEG_5_1_A (CoreAudio) + + This format is referred to as "5.1 (ITU 775)" in Logic Pro. + This format is referred to as "5.1" in Cubase. + This format is referred to as "5.1" in Pro Tools. + */ + static AudioChannelSet create5point1(); + + + /** Creates a set for a 6.0 Cine surround setup (left, right, centre, leftSurround, rightSurround, centreSurround). + + Is equivalent to: k60Cine (VST), AAX_eStemFormat_6_0 (AAX), kAudioChannelLayoutTag_AudioUnit_6_0 (CoreAudio) + + Logic Pro incorrectly uses this for the surround format labeled "6.1 (ES/EX)". + This format is referred to as "6.0 Cine" in Cubase. + This format is referred to as "6.0" in Pro Tools. + */ + static AudioChannelSet create6point0(); + + + /** Creates a set for a 6.1 Cine surround setup (left, right, centre, leftSurround, rightSurround, centreSurround, LFE). + + Is equivalent to: k61Cine (VST), AAX_eStemFormat_6_1 (AAX), kAudioChannelLayoutTag_MPEG_6_1_A (CoreAudio) + + This format is referred to as "6.1" in Pro Tools. + */ + static AudioChannelSet create6point1(); + + + /** Creates a set for a 6.0 Music surround setup (left, right, leftSurround, rightSurround, leftSurroundSide, rightSurroundSide). + + Is equivalent to: k60Music (VST), n/a (AAX), kAudioChannelLayoutTag_DTS_6_0_A (CoreAudio) + + This format is referred to as "6.0 Music" in Cubase. + */ + static AudioChannelSet create6point0Music(); + + + /** Creates a set for a 6.0 Music surround setup (left, right, leftSurround, rightSurround, leftSurroundSide, rightSurroundSide, LFE). + + Is equivalent to: k61Music (VST), n/a (AAX), kAudioChannelLayoutTag_DTS_6_1_A (CoreAudio) + */ + static AudioChannelSet create6point1Music(); + + + /** Creates a set for a DTS 7.0 surround setup (left, right, centre, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear). + + Is equivalent to: k70Music (VST), AAX_eStemFormat_7_0_DTS (AAX), kAudioChannelLayoutTag_AudioUnit_7_0 (CoreAudio) + + This format is referred to as "7.0" in Pro Tools. + */ + static AudioChannelSet create7point0(); + + + /** Creates a set for a SDDS 7.0 surround setup (left, right, centre, leftSurround, rightSurround, leftCentre, rightCentre). + + Is equivalent to: k70Cine (VST), AAX_eStemFormat_7_0_SDDS (AAX), kAudioChannelLayoutTag_AudioUnit_7_0_Front (CoreAudio) + + This format is referred to as "7.0 SDDS" in Pro Tools. + */ + static AudioChannelSet create7point0SDDS(); + + + /** Creates a set for a DTS 7.1 surround setup (left, right, centre, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear, LFE). + + Is equivalent to: k71CineSideFill (VST), AAX_eStemFormat_7_1_DTS (AAX), kAudioChannelLayoutTag_MPEG_7_1_C/kAudioChannelLayoutTag_ITU_3_4_1 (CoreAudio) + + This format is referred to as "7.1 (3/4.1)" in Logic Pro. + This format is referred to as "7.1" in Pro Tools. + */ + static AudioChannelSet create7point1(); + + + /** Creates a set for a 7.1 surround setup (left, right, centre, leftSurround, rightSurround, leftCentre, rightCentre, LFE). + + Is equivalent to: k71Cine (VST), AAX_eStemFormat_7_1_SDDS (AAX), kAudioChannelLayoutTag_MPEG_7_1_A (CoreAudio) + + This format is referred to as "7.1 (SDDS)" in Logic Pro. + This format is referred to as "7.1 SDDS" in Pro Tools. + */ + static AudioChannelSet create7point1SDDS(); + + + //============================================================================== + /** Creates a set for ambisonic surround setups (ambisonicW, ambisonicX, ambisonicY, ambisonicZ). + + Is equivalent to: kBFormat (VST), n/a (AAX), kAudioChannelLayoutTag_Ambisonic_B_Format (CoreAudio) + */ + static AudioChannelSet ambisonic(); + + + /** Creates a set for quadraphonic surround setup (left, right, leftSurround, rightSurround) + + Is equivalent to: k40Music (VST), AAX_eStemFormat_Quad (AAX), kAudioChannelLayoutTag_Quadraphonic (CoreAudio) + + This format is referred to as "Quadraphonic" in Logic Pro. + This format is referred to as "Quadro" in Cubase. + This format is referred to as "Quad" in Pro Tools. + */ + static AudioChannelSet quadraphonic(); + + + /** Creates a set for pentagonal surround setup (left, right, centre, leftSurroundRear, rightSurroundRear). + + Is equivalent to: n/a (VST), n/a (AAX), kAudioChannelLayoutTag_Pentagonal (CoreAudio) + */ + static AudioChannelSet pentagonal(); + + + /** Creates a set for hexagonal surround setup (left, right, leftSurroundRear, rightSurroundRear, centre, surroundCentre). + + Is equivalent to: n/a (VST), n/a (AAX), kAudioChannelLayoutTag_Hexagonal (CoreAudio) + */ + static AudioChannelSet hexagonal(); + + + /** Creates a set for octagonal surround setup (left, right, leftSurround, rightSurround, centre, centreSurround, wideLeft, wideRight). + + Is equivalent to: n/a (VST), n/a (AAX), kAudioChannelLayoutTag_Octagonal (CoreAudio) + */ + static AudioChannelSet octagonal(); + + //============================================================================== + /** Creates a set of untyped discrete channels. */ + static AudioChannelSet discreteChannels (int numChannels); + + /** Create a canonical channel set for a given number of channels. + For example, numChannels = 1 will return mono, numChannels = 2 will return stereo, etc. */ + static AudioChannelSet canonicalChannelSet (int numChannels); + + /** Create a channel set for a given number of channels which is non-discrete. + If numChannels is larger than the number of channels of the surround format + with the maximum amount of channels (currently 7.1 Surround), then this + function returns an empty set.*/ + static AudioChannelSet namedChannelSet (int numChannels); + + /** Return an array of channel sets which have a given number of channels */ + static Array channelSetsWithNumberOfChannels (int numChannels); + + //============================================================================== + /** Represents different audio channel types. */ + enum ChannelType + { + unknown = 0, + + left = 1, // L + right = 2, // R + centre = 3, // C (sometimes M for mono) + + LFE = 4, + leftSurround = 5, // Ls + rightSurround = 6, // Rs + leftCentre = 7, // Lc (AAX/VST), Lc used as Lss in AU for most layouts + rightCentre = 8, // Rc (AAX/VST), Rc used as Rss in AU for most layouts + centreSurround = 9, // Cs/S + surround = centreSurround, // Cs/S + leftSurroundSide = 10, // Lss (AXX), Side Left "Sl" (VST), Left Centre "LC" (AU) + rightSurroundSide = 11, // Rss (AXX), Side right "Sr" (VST), Right Centre "Rc" (AU) + topMiddle = 12, + topFrontLeft = 13, + topFrontCentre = 14, + topFrontRight = 15, + topRearLeft = 16, + topRearCentre = 17, + topRearRight = 18, + LFE2 = 19, + leftSurroundRear = 20, // Lsr (AAX), Lcs (VST), Rls (AU) + rightSurroundRear = 21, // Rsr (AAX), Rcs (VST), Rrs (AU) + wideLeft = 22, + wideRight = 23, + + + ambisonicW = 24, + ambisonicX = 25, + ambisonicY = 26, + ambisonicZ = 27, + + + discreteChannel0 = 64 /**< Non-typed individual channels are indexed upwards from this value. */ + }; + + /** Returns the name of a given channel type. For example, this method may return "Surround Left". */ + static String getChannelTypeName (ChannelType); + + /** Returns the abbreviated name of a channel type. For example, this method may return "Ls". */ + static String getAbbreviatedChannelTypeName (ChannelType); + + //============================================================================== + enum + { + maxChannelsOfNamedLayout = 8 + }; + + /** Adds a channel to the set. */ + void addChannel (ChannelType newChannelType); + + /** Removes a channel from the set. */ + void removeChannel (ChannelType newChannelType); + + /** Returns the number of channels in the set. */ + int size() const noexcept; + + /** Returns true if there are no channels in the set. */ + bool isDisabled() const noexcept { return size() == 0; } + + /** Returns an array of all the types in this channel set. */ + Array getChannelTypes() const; + + /** Returns the type of one of the channels in the set, by index. */ + ChannelType getTypeOfChannel (int channelIndex) const noexcept; + + /** Returns the index for a particular channel-type. + Will return -1 if the this set does not contain a channel of this type. */ + int getChannelIndexForType (ChannelType type) const noexcept; + + /** Returns a string containing a whitespace-separated list of speaker types + corresponding to each channel. For example in a 5.1 arrangement, + the string may be "L R C Lfe Ls Rs". If the speaker arrangement is unknown, + the returned string will be empty.*/ + String getSpeakerArrangementAsString() const; + + /** Returns the description of the current layout. For example, this method may return + "Quadraphonic". Note that the returned string may not be unique. */ + String getDescription() const; + + /** Returns if this is a channel layout made-up of discrete channels. */ + bool isDiscreteLayout() const noexcept; + + /** Intersect two channel layouts. */ + void intersect (const AudioChannelSet& other) { channels &= other.channels; } + + //============================================================================== + bool operator== (const AudioChannelSet&) const noexcept; + bool operator!= (const AudioChannelSet&) const noexcept; + bool operator< (const AudioChannelSet&) const noexcept; +private: + BigInteger channels; + + explicit AudioChannelSet (uint32); +}; + + + +#endif // JUCE_AUDIOCHANNELSET_H_INCLUDED diff --git a/modules/juce_audio_basics/effects/juce_IIRFilter.cpp b/modules/juce_audio_basics/effects/juce_IIRFilter.cpp index 836c0f6f..15c644c2 100644 --- a/modules/juce_audio_basics/effects/juce_IIRFilter.cpp +++ b/modules/juce_audio_basics/effects/juce_IIRFilter.cpp @@ -62,33 +62,131 @@ IIRCoefficients::IIRCoefficients (double c1, double c2, double c3, IIRCoefficients IIRCoefficients::makeLowPass (const double sampleRate, const double frequency) noexcept { - jassert (sampleRate > 0); + return makeLowPass (sampleRate, frequency, 1.0 / std::sqrt (2.0)); +} + +IIRCoefficients IIRCoefficients::makeLowPass (const double sampleRate, + const double frequency, + const double Q) noexcept +{ + jassert (sampleRate > 0.0); + jassert (frequency > 0.0 && frequency <= sampleRate * 0.5); + jassert (Q > 0.0); const double n = 1.0 / std::tan (double_Pi * frequency / sampleRate); const double nSquared = n * n; - const double c1 = 1.0 / (1.0 + std::sqrt (2.0) * n + nSquared); + const double c1 = 1.0 / (1.0 + 1.0 / Q * n + nSquared); return IIRCoefficients (c1, c1 * 2.0, c1, 1.0, c1 * 2.0 * (1.0 - nSquared), - c1 * (1.0 - std::sqrt (2.0) * n + nSquared)); + c1 * (1.0 - 1.0 / Q * n + nSquared)); } IIRCoefficients IIRCoefficients::makeHighPass (const double sampleRate, const double frequency) noexcept { + return makeHighPass (sampleRate, frequency, 1.0 / std::sqrt(2.0)); +} + +IIRCoefficients IIRCoefficients::makeHighPass (const double sampleRate, + const double frequency, + const double Q) noexcept +{ + jassert (sampleRate > 0.0); + jassert (frequency > 0.0 && frequency <= sampleRate * 0.5); + jassert (Q > 0.0); + const double n = std::tan (double_Pi * frequency / sampleRate); const double nSquared = n * n; - const double c1 = 1.0 / (1.0 + std::sqrt (2.0) * n + nSquared); + const double c1 = 1.0 / (1.0 + 1.0 / Q * n + nSquared); return IIRCoefficients (c1, c1 * -2.0, c1, 1.0, c1 * 2.0 * (nSquared - 1.0), - c1 * (1.0 - std::sqrt (2.0) * n + nSquared)); + c1 * (1.0 - 1.0 / Q * n + nSquared)); +} + +IIRCoefficients IIRCoefficients::makeBandPass (const double sampleRate, + const double frequency) noexcept +{ + return makeBandPass (sampleRate, frequency, 1.0 / std::sqrt (2.0)); +} + +IIRCoefficients IIRCoefficients::makeBandPass (const double sampleRate, + const double frequency, + const double Q) noexcept +{ + jassert (sampleRate > 0.0); + jassert (frequency > 0.0 && frequency <= sampleRate * 0.5); + jassert (Q > 0.0); + + const double n = 1.0 / std::tan (double_Pi * frequency / sampleRate); + const double nSquared = n * n; + const double c1 = 1.0 / (1.0 + 1.0 / Q * n + nSquared); + + return IIRCoefficients (c1 * n / Q, + 0.0, + -c1 * n / Q, + 1.0, + c1 * 2.0 * (1.0 - nSquared), + c1 * (1.0 - 1.0 / Q * n + nSquared)); +} + +IIRCoefficients IIRCoefficients::makeNotchFilter (const double sampleRate, + const double frequency) noexcept +{ + return makeNotchFilter (sampleRate, frequency, 1.0 / std::sqrt (2.0)); +} + +IIRCoefficients IIRCoefficients::makeNotchFilter (const double sampleRate, + const double frequency, + const double Q) noexcept +{ + jassert (sampleRate > 0.0); + jassert (frequency > 0.0 && frequency <= sampleRate * 0.5); + jassert (Q > 0.0); + + const double n = 1.0 / std::tan (double_Pi * frequency / sampleRate); + const double nSquared = n * n; + const double c1 = 1.0 / (1.0 + n / Q + nSquared); + + return IIRCoefficients (c1 * (1.0 + nSquared), + 2.0 * c1 * (1.0 - nSquared), + c1 * (1.0 + nSquared), + 1.0, + c1 * 2.0 * (1.0 - nSquared), + c1 * (1.0 - n / Q + nSquared)); +} + +IIRCoefficients IIRCoefficients::makeAllPass (const double sampleRate, + const double frequency) noexcept +{ + return makeAllPass (sampleRate, frequency, 1.0 / std::sqrt (2.0)); +} + +IIRCoefficients IIRCoefficients::makeAllPass (const double sampleRate, + const double frequency, + const double Q) noexcept +{ + jassert (sampleRate > 0.0); + jassert (frequency > 0.0 && frequency <= sampleRate * 0.5); + jassert (Q > 0.0); + + const double n = 1.0 / std::tan (double_Pi * frequency / sampleRate); + const double nSquared = n * n; + const double c1 = 1.0 / (1.0 + 1.0 / Q * n + nSquared); + + return IIRCoefficients (c1 * (1.0 - n / Q + nSquared), + c1 * 2.0 * (1.0 - nSquared), + 1.0, + 1.0, + c1 * 2.0 * (1.0 - nSquared), + c1 * (1.0 - n / Q + nSquared)); } IIRCoefficients IIRCoefficients::makeLowShelf (const double sampleRate, @@ -96,8 +194,9 @@ IIRCoefficients IIRCoefficients::makeLowShelf (const double sampleRate, const double Q, const float gainFactor) noexcept { - jassert (sampleRate > 0); - jassert (Q > 0); + jassert (sampleRate > 0.0); + jassert (cutOffFrequency > 0.0 && cutOffFrequency <= sampleRate * 0.5); + jassert (Q > 0.0); const double A = jmax (0.0f, std::sqrt (gainFactor)); const double aminus1 = A - 1.0; @@ -120,8 +219,9 @@ IIRCoefficients IIRCoefficients::makeHighShelf (const double sampleRate, const double Q, const float gainFactor) noexcept { - jassert (sampleRate > 0); - jassert (Q > 0); + jassert (sampleRate > 0.0); + jassert (cutOffFrequency > 0.0 && cutOffFrequency <= sampleRate * 0.5); + jassert (Q > 0.0); const double A = jmax (0.0f, std::sqrt (gainFactor)); const double aminus1 = A - 1.0; @@ -140,15 +240,16 @@ IIRCoefficients IIRCoefficients::makeHighShelf (const double sampleRate, } IIRCoefficients IIRCoefficients::makePeakFilter (const double sampleRate, - const double centreFrequency, + const double frequency, const double Q, const float gainFactor) noexcept { - jassert (sampleRate > 0); - jassert (Q > 0); + jassert (sampleRate > 0.0); + jassert (frequency > 0.0 && frequency <= sampleRate * 0.5); + jassert (Q > 0.0); const double A = jmax (0.0f, std::sqrt (gainFactor)); - const double omega = (double_Pi * 2.0 * jmax (centreFrequency, 2.0)) / sampleRate; + const double omega = (double_Pi * 2.0 * jmax (frequency, 2.0)) / sampleRate; const double alpha = 0.5 * std::sin (omega) / Q; const double c2 = -2.0 * std::cos (omega); const double alphaTimesA = alpha * A; @@ -164,12 +265,12 @@ IIRCoefficients IIRCoefficients::makePeakFilter (const double sampleRate, //============================================================================== IIRFilter::IIRFilter() noexcept - : v1 (0), v2 (0), active (false) + : v1 (0.0), v2 (0.0), active (false) { } IIRFilter::IIRFilter (const IIRFilter& other) noexcept - : v1 (0), v2 (0), active (other.active) + : v1 (0.0), v2 (0.0), active (other.active) { const SpinLock::ScopedLockType sl (other.processLock); coefficients = other.coefficients; @@ -198,7 +299,7 @@ void IIRFilter::setCoefficients (const IIRCoefficients& newCoefficients) noexcep void IIRFilter::reset() noexcept { const SpinLock::ScopedLockType sl (processLock); - v1 = v2 = 0; + v1 = v2 = 0.0; } float IIRFilter::processSingleSampleRaw (const float in) noexcept diff --git a/modules/juce_audio_basics/effects/juce_IIRFilter.h b/modules/juce_audio_basics/effects/juce_IIRFilter.h index 03deee72..a7150667 100644 --- a/modules/juce_audio_basics/effects/juce_IIRFilter.h +++ b/modules/juce_audio_basics/effects/juce_IIRFilter.h @@ -55,14 +55,53 @@ public: /** Destructor. */ ~IIRCoefficients() noexcept; + //============================================================================== /** Returns the coefficients for a low-pass filter. */ static IIRCoefficients makeLowPass (double sampleRate, double frequency) noexcept; + /** Returns the coefficients for a low-pass filter with variable Q. */ + static IIRCoefficients makeLowPass (double sampleRate, + double frequency, + double Q) noexcept; + + //============================================================================== /** Returns the coefficients for a high-pass filter. */ static IIRCoefficients makeHighPass (double sampleRate, double frequency) noexcept; + /** Returns the coefficients for a high-pass filter with variable Q. */ + static IIRCoefficients makeHighPass (double sampleRate, + double frequency, + double Q) noexcept; + + //============================================================================== + /** Returns the coefficients for a band-pass filter. */ + static IIRCoefficients makeBandPass (double sampleRate, double frequency) noexcept; + + /** Returns the coefficients for a band-pass filter with variable Q. */ + static IIRCoefficients makeBandPass (double sampleRate, + double frequency, + double Q) noexcept; + + //============================================================================== + /** Returns the coefficients for a notch filter. */ + static IIRCoefficients makeNotchFilter (double sampleRate, double frequency) noexcept; + + /** Returns the coefficients for a notch filter with variable Q. */ + static IIRCoefficients makeNotchFilter (double sampleRate, + double frequency, + double Q) noexcept; + + //============================================================================== + /** Returns the coefficients for an all-pass filter. */ + static IIRCoefficients makeAllPass (double sampleRate, double frequency) noexcept; + + /** Returns the coefficients for an all-pass filter with variable Q. */ + static IIRCoefficients makeAllPass (double sampleRate, + double frequency, + double Q) noexcept; + //============================================================================== /** Returns the coefficients for a low-pass shelf filter with variable Q and gain. diff --git a/modules/juce_audio_basics/juce_audio_basics.cpp b/modules/juce_audio_basics/juce_audio_basics.cpp index 86b41a23..a0d839fa 100644 --- a/modules/juce_audio_basics/juce_audio_basics.cpp +++ b/modules/juce_audio_basics/juce_audio_basics.cpp @@ -83,6 +83,7 @@ namespace juce #include "buffers/juce_AudioDataConverters.cpp" #include "buffers/juce_FloatVectorOperations.cpp" +#include "buffers/juce_AudioChannelSet.cpp" #include "effects/juce_IIRFilter.cpp" #include "effects/juce_LagrangeInterpolator.cpp" #include "effects/juce_CatmullRomInterpolator.cpp" diff --git a/modules/juce_audio_basics/juce_audio_basics.h b/modules/juce_audio_basics/juce_audio_basics.h index cbd3300d..aec18a14 100644 --- a/modules/juce_audio_basics/juce_audio_basics.h +++ b/modules/juce_audio_basics/juce_audio_basics.h @@ -33,7 +33,7 @@ ID: juce_audio_basics vendor: juce - version: 4.2.4 + version: 4.3.0 name: JUCE audio and MIDI data classes description: Classes for audio buffer manipulation, midi message handling, synthesis, etc. website: http://www.juce.com/juce @@ -62,6 +62,7 @@ namespace juce #include "buffers/juce_AudioDataConverters.h" #include "buffers/juce_FloatVectorOperations.h" #include "buffers/juce_AudioSampleBuffer.h" +#include "buffers/juce_AudioChannelSet.h" #include "effects/juce_Decibels.h" #include "effects/juce_IIRFilter.h" #include "effects/juce_LagrangeInterpolator.h" diff --git a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp index 7b2ab85c..4d6e436f 100644 --- a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp @@ -80,7 +80,7 @@ int MidiMessageSequence::getIndexOfMatchingKeyUp (const int index) const noexcep return -1; } -int MidiMessageSequence::getIndexOf (MidiEventHolder* const event) const noexcept +int MidiMessageSequence::getIndexOf (const MidiEventHolder* const event) const noexcept { return list.indexOf (event); } diff --git a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h index 3e04245d..dd6b0151 100644 --- a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h +++ b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.h @@ -121,7 +121,7 @@ public: int getIndexOfMatchingKeyUp (int index) const noexcept; /** Returns the index of an event. */ - int getIndexOf (MidiEventHolder* event) const noexcept; + int getIndexOf (const MidiEventHolder* event) const noexcept; /** Returns the index of the first event on or after the given timestamp. If the time is beyond the end of the sequence, this will return the diff --git a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.cpp b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.cpp index c47cc5e5..3443e149 100644 --- a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.cpp +++ b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.cpp @@ -26,7 +26,8 @@ BufferingAudioSource::BufferingAudioSource (PositionableAudioSource* s, TimeSliceThread& thread, const bool deleteSourceWhenDeleted, const int bufferSizeSamples, - const int numChannels) + const int numChannels, + bool prefillBufferOnPrepareToPlay) : source (s, deleteSourceWhenDeleted), backgroundThread (thread), numberOfSamplesToBuffer (jmax (1024, bufferSizeSamples)), @@ -36,7 +37,8 @@ BufferingAudioSource::BufferingAudioSource (PositionableAudioSource* s, nextPlayPos (0), sampleRate (0), wasSourceLooping (false), - isPrepared (false) + isPrepared (false), + prefillBuffer (prefillBufferOnPrepareToPlay) { jassert (source != nullptr); @@ -73,12 +75,13 @@ void BufferingAudioSource::prepareToPlay (int samplesPerBlockExpected, double ne backgroundThread.addTimeSliceClient (this); - while (bufferValidEnd - bufferValidStart < jmin (((int) newSampleRate) / 4, - buffer.getNumSamples() / 2)) + do { backgroundThread.moveToFrontOfQueue (this); Thread::sleep (5); } + while (prefillBuffer + && (bufferValidEnd - bufferValidStart < jmin (((int) newSampleRate) / 4, buffer.getNumSamples() / 2))); } } @@ -88,7 +91,12 @@ void BufferingAudioSource::releaseResources() backgroundThread.removeTimeSliceClient (this); buffer.setSize (numberOfChannels, 0); - source->releaseResources(); + + // MSVC2015 seems to need this if statement to not generate a warning during linking. + // As source is set in the constructor, there is no way that source could + // ever equal this, but it seems to make MSVC2015 happy. + if (source != this) + source->releaseResources(); } void BufferingAudioSource::getNextAudioBlock (const AudioSourceChannelInfo& info) @@ -148,6 +156,41 @@ void BufferingAudioSource::getNextAudioBlock (const AudioSourceChannelInfo& info } } +bool BufferingAudioSource::waitForNextAudioBlockReady (const AudioSourceChannelInfo& info, const uint32 timeout) +{ + if (!source || source->getTotalLength() <= 0) + return false; + + if (nextPlayPos + info.numSamples < 0) + return true; + + if (! isLooping() && nextPlayPos > getTotalLength()) + return true; + + const uint32 endTime = Time::getMillisecondCounter() + timeout; + uint32 now = Time::getMillisecondCounter(); + + while (now < endTime) + { + { + const ScopedLock sl (bufferStartPosLock); + + const int validStart = static_cast (jlimit (bufferValidStart, bufferValidEnd, nextPlayPos) - nextPlayPos); + const int validEnd = static_cast (jlimit (bufferValidStart, bufferValidEnd, nextPlayPos + info.numSamples) - nextPlayPos); + + if (validStart <= 0 && validStart < validEnd && validEnd >= info.numSamples) + return true; + } + + if (! bufferReadyEvent.wait (static_cast (endTime - now))) + return false; + + now = Time::getMillisecondCounter(); + } + + return false; +} + int64 BufferingAudioSource::getNextReadPosition() const { jassert (source->getTotalLength() > 0); @@ -241,6 +284,8 @@ bool BufferingAudioSource::readNextBufferChunk() bufferValidEnd = newBVE; } + bufferReadyEvent.signal(); + return true; } diff --git a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h index 88116207..717e35d5 100644 --- a/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h +++ b/modules/juce_audio_basics/sources/juce_BufferingAudioSource.h @@ -43,21 +43,24 @@ public: //============================================================================== /** Creates a BufferingAudioSource. - @param source the input source to read from - @param backgroundThread a background thread that will be used for the - background read-ahead. This object must not be deleted - until after any BufferingAudioSources that are using it - have been deleted! - @param deleteSourceWhenDeleted if true, then the input source object will - be deleted when this object is deleted - @param numberOfSamplesToBuffer the size of buffer to use for reading ahead - @param numberOfChannels the number of channels that will be played + @param source the input source to read from + @param backgroundThread a background thread that will be used for the + background read-ahead. This object must not be deleted + until after any BufferingAudioSources that are using it + have been deleted! + @param deleteSourceWhenDeleted if true, then the input source object will + be deleted when this object is deleted + @param numberOfSamplesToBuffer the size of buffer to use for reading ahead + @param numberOfChannels the number of channels that will be played + @param prefillBufferOnPrepareToPlay if true, then calling prepareToPlay on this object will + block until the buffer has been filled */ BufferingAudioSource (PositionableAudioSource* source, TimeSliceThread& backgroundThread, bool deleteSourceWhenDeleted, int numberOfSamplesToBuffer, - int numberOfChannels = 2); + int numberOfChannels = 2, + bool prefillBufferOnPrepareToPlay = true); /** Destructor. @@ -89,6 +92,12 @@ public: /** Implements the PositionableAudioSource method. */ bool isLooping() const override { return source->isLooping(); } + /** A useful function to block until the next the buffer info can be filled. + + This is useful for offline rendering. + */ + bool waitForNextAudioBlockReady (const AudioSourceChannelInfo& info, const uint32 timeout); + private: //============================================================================== OptionalScopedPointer source; @@ -96,9 +105,10 @@ private: int numberOfSamplesToBuffer, numberOfChannels; AudioSampleBuffer buffer; CriticalSection bufferStartPosLock; + WaitableEvent bufferReadyEvent; int64 volatile bufferValidStart, bufferValidEnd, nextPlayPos; double volatile sampleRate; - bool wasSourceLooping, isPrepared; + bool wasSourceLooping, isPrepared, prefillBuffer; bool readNextBufferChunk(); void readBufferSection (int64 start, int length, int bufferOffset); diff --git a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp index 8bc95838..38c51e1a 100644 --- a/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp +++ b/modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp @@ -179,6 +179,7 @@ void Synthesiser::processNextBlock (AudioBuffer& outputAudio, { // must set the sample rate before using this! jassert (sampleRate != 0); + const int targetChannels = outputAudio.getNumChannels(); MidiBuffer::Iterator midiIterator (midiData); midiIterator.setNextSamplePosition (startSample); @@ -193,7 +194,9 @@ void Synthesiser::processNextBlock (AudioBuffer& outputAudio, { if (! midiIterator.getNextEvent (m, midiEventPos)) { - renderVoices (outputAudio, startSample, numSamples); + if (targetChannels > 0) + renderVoices (outputAudio, startSample, numSamples); + return; } @@ -201,7 +204,9 @@ void Synthesiser::processNextBlock (AudioBuffer& outputAudio, if (samplesToNextMidiMessage >= numSamples) { - renderVoices (outputAudio, startSample, numSamples); + if (targetChannels > 0) + renderVoices (outputAudio, startSample, numSamples); + handleMidiEvent (m); break; } @@ -214,7 +219,9 @@ void Synthesiser::processNextBlock (AudioBuffer& outputAudio, firstEvent = false; - renderVoices (outputAudio, startSample, samplesToNextMidiMessage); + if (targetChannels > 0) + renderVoices (outputAudio, startSample, samplesToNextMidiMessage); + handleMidiEvent (m); startSample += samplesToNextMidiMessage; numSamples -= samplesToNextMidiMessage; diff --git a/modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h b/modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h deleted file mode 100644 index fae2cd06..00000000 --- a/modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h +++ /dev/null @@ -1,169 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library. - Copyright (c) 2015 - ROLI Ltd. - - Permission is granted to use this software under the terms of either: - a) the GPL v2 (or any later version) - b) the Affero GPL v3 - - Details of these licenses can be found at: www.gnu.org/licenses - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.juce.com for more information. - - ============================================================================== -*/ - -#ifndef JUCE_AUDIOCDBURNER_H_INCLUDED -#define JUCE_AUDIOCDBURNER_H_INCLUDED - -#if JUCE_USE_CDBURNER || DOXYGEN - - -//============================================================================== -/** -*/ -class AudioCDBurner : public ChangeBroadcaster -{ -public: - //============================================================================== - /** Returns a list of available optical drives. - - Use openDevice() to open one of the items from this list. - */ - static StringArray findAvailableDevices(); - - /** Tries to open one of the optical drives. - - The deviceIndex is an index into the array returned by findAvailableDevices(). - */ - static AudioCDBurner* openDevice (const int deviceIndex); - - /** Destructor. */ - ~AudioCDBurner(); - - //============================================================================== - enum DiskState - { - unknown, /**< An error condition, if the device isn't responding. */ - trayOpen, /**< The drive is currently open. Note that a slot-loading drive - may seem to be permanently open. */ - noDisc, /**< The drive has no disk in it. */ - writableDiskPresent, /**< The drive contains a writeable disk. */ - readOnlyDiskPresent /**< The drive contains a read-only disk. */ - }; - - /** Returns the current status of the device. - - To get informed when the drive's status changes, attach a ChangeListener to - the AudioCDBurner. - */ - DiskState getDiskState() const; - - /** Returns true if there's a writable disk in the drive. */ - bool isDiskPresent() const; - - /** Sends an eject signal to the drive. - The eject will happen asynchronously, so you can use getDiskState() and - waitUntilStateChange() to monitor its progress. - */ - bool openTray(); - - /** Blocks the current thread until the drive's state changes, or until the timeout expires. - @returns the device's new state - */ - DiskState waitUntilStateChange (int timeOutMilliseconds); - - //============================================================================== - /** Returns the set of possible write speeds that the device can handle. - These are as a multiple of 'normal' speed, so e.g. '24x' returns 24, etc. - Note that if there's no media present in the drive, this value may be unavailable! - @see setWriteSpeed, getWriteSpeed - */ - Array getAvailableWriteSpeeds() const; - - //============================================================================== - /** Tries to enable or disable buffer underrun safety on devices that support it. - @returns true if it's now enabled. If the device doesn't support it, this - will always return false. - */ - bool setBufferUnderrunProtection (bool shouldBeEnabled); - - //============================================================================== - /** Returns the number of free blocks on the disk. - - There are 75 blocks per second, at 44100Hz. - */ - int getNumAvailableAudioBlocks() const; - - /** Adds a track to be written. - - The source passed-in here will be kept by this object, and it will - be used and deleted at some point in the future, either during the - burn() method or when this AudioCDBurner object is deleted. Your caller - method shouldn't keep a reference to it or use it again after passing - it in here. - */ - bool addAudioTrack (AudioSource* source, int numSamples); - - //============================================================================== - /** Receives progress callbacks during a cd-burn operation. - @see AudioCDBurner::burn() - */ - class BurnProgressListener - { - public: - BurnProgressListener() noexcept {} - virtual ~BurnProgressListener() {} - - /** Called at intervals to report on the progress of the AudioCDBurner. - - To cancel the burn, return true from this method. - */ - virtual bool audioCDBurnProgress (float proportionComplete) = 0; - }; - - /** Runs the burn process. - This method will block until the operation is complete. - - @param listener the object to receive callbacks about progress - @param ejectDiscAfterwards whether to eject the disk after the burn completes - @param performFakeBurnForTesting if true, no data will actually be written to the disk - @param writeSpeed one of the write speeds from getAvailableWriteSpeeds(), or - 0 or less to mean the fastest speed. - */ - String burn (BurnProgressListener* listener, - bool ejectDiscAfterwards, - bool performFakeBurnForTesting, - int writeSpeed); - - /** If a burn operation is currently in progress, this tells it to stop - as soon as possible. - - It's also possible to stop the burn process by returning true from - BurnProgressListener::audioCDBurnProgress() - */ - void abortBurn(); - -private: - //============================================================================== - AudioCDBurner (const int deviceIndex); - - class Pimpl; - friend struct ContainerDeletePolicy; - ScopedPointer pimpl; - - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioCDBurner) -}; - - -#endif -#endif // JUCE_AUDIOCDBURNER_H_INCLUDED diff --git a/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.cpp b/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.cpp deleted file mode 100644 index b9d79878..00000000 --- a/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library. - Copyright (c) 2015 - ROLI Ltd. - - Permission is granted to use this software under the terms of either: - a) the GPL v2 (or any later version) - b) the Affero GPL v3 - - Details of these licenses can be found at: www.gnu.org/licenses - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.juce.com for more information. - - ============================================================================== -*/ - -#if JUCE_USE_CDREADER - -int AudioCDReader::getNumTracks() const -{ - return trackStartSamples.size() - 1; -} - -int AudioCDReader::getPositionOfTrackStart (int trackNum) const -{ - return trackStartSamples [trackNum]; -} - -const Array& AudioCDReader::getTrackOffsets() const -{ - return trackStartSamples; -} - -int AudioCDReader::getCDDBId() -{ - int checksum = 0; - const int numTracks = getNumTracks(); - - for (int i = 0; i < numTracks; ++i) - for (int offset = (trackStartSamples.getUnchecked(i) + 88200) / 44100; offset > 0; offset /= 10) - checksum += offset % 10; - - const int length = (trackStartSamples.getLast() - trackStartSamples.getFirst()) / 44100; - - // CCLLLLTT: checksum, length, tracks - return ((checksum & 0xff) << 24) | (length << 8) | numTracks; -} - -#endif diff --git a/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h b/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h deleted file mode 100644 index bb9ac6ec..00000000 --- a/modules/juce_audio_devices/audio_cd/juce_AudioCDReader.h +++ /dev/null @@ -1,174 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library. - Copyright (c) 2015 - ROLI Ltd. - - Permission is granted to use this software under the terms of either: - a) the GPL v2 (or any later version) - b) the Affero GPL v3 - - Details of these licenses can be found at: www.gnu.org/licenses - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.juce.com for more information. - - ============================================================================== -*/ - -#ifndef JUCE_AUDIOCDREADER_H_INCLUDED -#define JUCE_AUDIOCDREADER_H_INCLUDED - -#if JUCE_USE_CDREADER || DOXYGEN - - -//============================================================================== -/** - A type of AudioFormatReader that reads from an audio CD. - - One of these can be used to read a CD as if it's one big audio stream. Use the - getPositionOfTrackStart() method to find where the individual tracks are - within the stream. - - @see AudioFormatReader -*/ -class JUCE_API AudioCDReader : public AudioFormatReader -{ -public: - //============================================================================== - /** Returns a list of names of Audio CDs currently available for reading. - - If there's a CD drive but no CD in it, this might return an empty list, or - possibly a device that can be opened but which has no tracks, depending - on the platform. - - @see createReaderForCD - */ - static StringArray getAvailableCDNames(); - - /** Tries to create an AudioFormatReader that can read from an Audio CD. - - @param index the index of one of the available CDs - use getAvailableCDNames() - to find out how many there are. - @returns a new AudioCDReader object, or nullptr if it couldn't be created. The - caller will be responsible for deleting the object returned. - */ - static AudioCDReader* createReaderForCD (const int index); - - //============================================================================== - /** Destructor. */ - ~AudioCDReader(); - - /** Implementation of the AudioFormatReader method. */ - bool readSamples (int** destSamples, int numDestChannels, int startOffsetInDestBuffer, - int64 startSampleInFile, int numSamples) override; - - /** Checks whether the CD has been removed from the drive. */ - bool isCDStillPresent() const; - - /** Returns the total number of tracks (audio + data). */ - int getNumTracks() const; - - /** Finds the sample offset of the start of a track. - @param trackNum the track number, where trackNum = 0 is the first track - and trackNum = getNumTracks() means the end of the CD. - */ - int getPositionOfTrackStart (int trackNum) const; - - /** Returns true if a given track is an audio track. - @param trackNum the track number, where 0 is the first track. - */ - bool isTrackAudio (int trackNum) const; - - /** Returns an array of sample offsets for the start of each track, followed by - the sample position of the end of the CD. - */ - const Array& getTrackOffsets() const; - - /** Refreshes the object's table of contents. - - If the disc has been ejected and a different one put in since this - object was created, this will cause it to update its idea of how many tracks - there are, etc. - */ - void refreshTrackLengths(); - - /** Enables scanning for indexes within tracks. - @see getLastIndex - */ - void enableIndexScanning (bool enabled); - - /** Returns the index number found during the last read() call. - - Index scanning is turned off by default - turn it on with enableIndexScanning(). - - Then when the read() method is called, if it comes across an index within that - block, the index number is stored and returned by this method. - - Some devices might not support indexes, of course. - - (If you don't know what CD indexes are, it's unlikely you'll ever need them). - - @see enableIndexScanning - */ - int getLastIndex() const; - - /** Scans a track to find the position of any indexes within it. - @param trackNumber the track to look in, where 0 is the first track on the disc - @returns an array of sample positions of any index points found (not including - the index that marks the start of the track) - */ - Array findIndexesInTrack (const int trackNumber); - - /** Returns the CDDB id number for the CD. - It's not a great way of identifying a disc, but it's traditional. - */ - int getCDDBId(); - - /** Tries to eject the disk. - Ejecting the disk might not actually be possible, e.g. if some other process is using it. - */ - void ejectDisk(); - - //============================================================================== - enum - { - framesPerSecond = 75, - samplesPerFrame = 44100 / framesPerSecond - }; - -private: - //============================================================================== - Array trackStartSamples; - - #if JUCE_MAC - File volumeDir; - Array tracks; - int currentReaderTrack; - ScopedPointer reader; - AudioCDReader (const File& volume); - - #elif JUCE_WINDOWS - bool audioTracks [100]; - void* handle; - MemoryBlock buffer; - bool indexingEnabled; - int lastIndex, firstFrameInBuffer, samplesInBuffer; - AudioCDReader (void* handle); - int getIndexAt (int samplePos); - - #elif JUCE_LINUX - AudioCDReader(); - #endif - - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioCDReader) -}; - -#endif -#endif // JUCE_AUDIOCDREADER_H_INCLUDED diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp old mode 100755 new mode 100644 index 62c99379..cea7b9be --- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp +++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp @@ -86,71 +86,12 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CallbackHandler) }; -//============================================================================== -// This is an AudioTransportSource which will own it's assigned source -struct AudioSourceOwningTransportSource : public AudioTransportSource -{ - AudioSourceOwningTransportSource (PositionableAudioSource* s) : source (s) - { - AudioTransportSource::setSource (s); - } - - ~AudioSourceOwningTransportSource() - { - setSource (nullptr); - } - -private: - ScopedPointer source; - - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioSourceOwningTransportSource) -}; - -//============================================================================== -// An AudioSourcePlayer which will remove itself from the AudioDeviceManager's -// callback list once it finishes playing its source -struct AutoRemovingSourcePlayer : public AudioSourcePlayer, - private Timer -{ - AutoRemovingSourcePlayer (AudioDeviceManager& dm, AudioTransportSource* ts, bool ownSource) - : manager (dm), transportSource (ts, ownSource) - { - jassert (ts != nullptr); - manager.addAudioCallback (this); - AudioSourcePlayer::setSource (transportSource); - startTimerHz (10); - } - - ~AutoRemovingSourcePlayer() - { - setSource (nullptr); - manager.removeAudioCallback (this); - } - - void timerCallback() override - { - if (getCurrentSource() == nullptr || ! transportSource->isPlaying()) - delete this; - } - - void audioDeviceStopped() override - { - AudioSourcePlayer::audioDeviceStopped(); - setSource (nullptr); - } - -private: - AudioDeviceManager& manager; - OptionalScopedPointer transportSource; - - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AutoRemovingSourcePlayer) -}; - //============================================================================== AudioDeviceManager::AudioDeviceManager() : numInputChansNeeded (0), numOutputChansNeeded (2), listNeedsScanning (true), + testSoundPosition (0), cpuUsageMs (0), timeToCpuScale (0) { @@ -161,10 +102,6 @@ AudioDeviceManager::~AudioDeviceManager() { currentAudioDevice = nullptr; defaultMidiOutput = nullptr; - - for (int i = 0; i < callbacks.size(); ++i) - if (AutoRemovingSourcePlayer* p = dynamic_cast (callbacks.getUnchecked(i))) - delete p; } //============================================================================== @@ -649,6 +586,8 @@ void AudioDeviceManager::stopDevice() { if (currentAudioDevice != nullptr) currentAudioDevice->stop(); + + testSound = nullptr; } void AudioDeviceManager::closeAudioDevice() @@ -797,6 +736,20 @@ void AudioDeviceManager::audioDeviceIOCallbackInt (const float** inputChannelDat for (int i = 0; i < numOutputChannels; ++i) zeromem (outputChannelData[i], sizeof (float) * (size_t) numSamples); } + + if (testSound != nullptr) + { + const int numSamps = jmin (numSamples, testSound->getNumSamples() - testSoundPosition); + const float* const src = testSound->getReadPointer (0, testSoundPosition); + + for (int i = 0; i < numOutputChannels; ++i) + for (int j = 0; j < numSamps; ++j) + outputChannelData [i][j] += src[j]; + + testSoundPosition += numSamps; + if (testSoundPosition >= testSound->getNumSamples()) + testSound = nullptr; + } } void AudioDeviceManager::audioDeviceAboutToStartInt (AudioIODevice* const device) @@ -964,158 +917,6 @@ void AudioDeviceManager::setDefaultMidiOutput (const String& deviceName) } } -//============================================================================== -// An AudioSource which simply outputs a buffer -class AudioSampleBufferSource : public PositionableAudioSource -{ -public: - AudioSampleBufferSource (AudioSampleBuffer* audioBuffer, bool ownBuffer, bool playOnAllChannels) - : buffer (audioBuffer, ownBuffer), - position (0), looping (false), playAcrossAllChannels (playOnAllChannels) - {} - - //============================================================================== - void setNextReadPosition (int64 newPosition) override - { - jassert (newPosition >= 0); - - if (looping) - newPosition = newPosition % static_cast (buffer->getNumSamples()); - - position = jmin (buffer->getNumSamples(), static_cast (newPosition)); - } - - int64 getNextReadPosition() const override { return static_cast (position); } - int64 getTotalLength() const override { return static_cast (buffer->getNumSamples()); } - - bool isLooping() const override { return looping; } - void setLooping (bool shouldLoop) override { looping = shouldLoop; } - - //============================================================================== - void prepareToPlay (int, double) override {} - void releaseResources() override {} - - void getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill) override - { - bufferToFill.clearActiveBufferRegion(); - - const int bufferSize = buffer->getNumSamples(); - const int samplesNeeded = bufferToFill.numSamples; - const int samplesToCopy = jmin (bufferSize - position, samplesNeeded); - - if (samplesToCopy > 0) - { - int maxInChannels = buffer->getNumChannels(); - int maxOutChannels = bufferToFill.buffer->getNumChannels(); - - if (! playAcrossAllChannels) - maxOutChannels = jmin (maxOutChannels, maxInChannels); - - for (int i = 0; i < maxOutChannels; ++i) - bufferToFill.buffer->copyFrom (i, bufferToFill.startSample, *buffer, - i % maxInChannels, position, samplesToCopy); - } - - position += samplesNeeded; - - if (looping) - position %= bufferSize; - } - -private: - //============================================================================== - OptionalScopedPointer buffer; - int position; - bool looping, playAcrossAllChannels; - - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioSampleBufferSource) -}; - -void AudioDeviceManager::playSound (const File& file) -{ - if (file.existsAsFile()) - { - AudioFormatManager formatManager; - - formatManager.registerBasicFormats(); - playSound (formatManager.createReaderFor (file), true); - } -} - -void AudioDeviceManager::playSound (const void* resourceData, size_t resourceSize) -{ - if (resourceData != nullptr && resourceSize > 0) - { - AudioFormatManager formatManager; - formatManager.registerBasicFormats(); - MemoryInputStream* mem = new MemoryInputStream (resourceData, resourceSize, false); - playSound (formatManager.createReaderFor (mem), true); - } -} - -void AudioDeviceManager::playSound (AudioFormatReader* reader, bool deleteWhenFinished) -{ - if (reader != nullptr) - playSound (new AudioFormatReaderSource (reader, deleteWhenFinished), true); -} - -void AudioDeviceManager::playSound (AudioSampleBuffer* buffer, bool deleteWhenFinished, bool playOnAllOutputChannels) -{ - if (buffer != nullptr) - playSound (new AudioSampleBufferSource (buffer, deleteWhenFinished, playOnAllOutputChannels), true); -} - -void AudioDeviceManager::playSound (PositionableAudioSource* audioSource, bool deleteWhenFinished) -{ - if (audioSource != nullptr && currentAudioDevice != nullptr) - { - AudioTransportSource* transport = dynamic_cast (audioSource); - - if (transport == nullptr) - { - if (deleteWhenFinished) - { - transport = new AudioSourceOwningTransportSource (audioSource); - } - else - { - transport = new AudioTransportSource(); - transport->setSource (audioSource); - deleteWhenFinished = true; - } - } - - transport->start(); - new AutoRemovingSourcePlayer (*this, transport, deleteWhenFinished); - } - else - { - if (deleteWhenFinished) - delete audioSource; - } -} - -void AudioDeviceManager::playTestSound() -{ - const double sampleRate = currentAudioDevice->getCurrentSampleRate(); - const int soundLength = (int) sampleRate; - - const double frequency = 440.0; - const float amplitude = 0.5f; - - const double phasePerSample = double_Pi * 2.0 / (sampleRate / frequency); - - AudioSampleBuffer* newSound = new AudioSampleBuffer (1, soundLength); - - for (int i = 0; i < soundLength; ++i) - newSound->setSample (0, i, amplitude * (float) std::sin (i * phasePerSample)); - - newSound->applyGainRamp (0, 0, soundLength / 10, 0.0f, 1.0f); - newSound->applyGainRamp (0, soundLength - soundLength / 4, soundLength / 4, 1.0f, 0.0f); - - playSound (newSound, true, true); -} - //============================================================================== AudioDeviceManager::LevelMeter::LevelMeter() noexcept : level() {} @@ -1160,6 +961,42 @@ double AudioDeviceManager::LevelMeter::getCurrentLevel() const noexcept return level; } +void AudioDeviceManager::playTestSound() +{ + { // cunningly nested to swap, unlock and delete in that order. + ScopedPointer oldSound; + + { + const ScopedLock sl (audioCallbackLock); + oldSound = testSound; + } + } + + testSoundPosition = 0; + + if (currentAudioDevice != nullptr) + { + const double sampleRate = currentAudioDevice->getCurrentSampleRate(); + const int soundLength = (int) sampleRate; + + const double frequency = 440.0; + const float amplitude = 0.5f; + + const double phasePerSample = double_Pi * 2.0 / (sampleRate / frequency); + + AudioSampleBuffer* const newSound = new AudioSampleBuffer (1, soundLength); + + for (int i = 0; i < soundLength; ++i) + newSound->setSample (0, i, amplitude * (float) std::sin (i * phasePerSample)); + + newSound->applyGainRamp (0, 0, soundLength / 10, 0.0f, 1.0f); + newSound->applyGainRamp (0, soundLength - soundLength / 4, soundLength / 4, 1.0f, 0.0f); + + const ScopedLock sl (audioCallbackLock); + testSound = newSound; + } +} + double AudioDeviceManager::getCurrentInputLevel() const noexcept { return inputLevelMeter.getCurrentLevel(); } double AudioDeviceManager::getCurrentOutputLevel() const noexcept { return outputLevelMeter.getCurrentLevel(); } diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h index 59977c63..9d90f5be 100644 --- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h +++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h @@ -404,57 +404,6 @@ public: */ void playTestSound(); - /** Plays a sound from a file. */ - void playSound (const File& file); - - /** Convenient method to play sound from a JUCE resource. */ - void playSound (const void* resourceData, size_t resourceSize); - - /** Plays the sound from an audio format reader. - - If deleteWhenFinished is true then the format reader will be - automatically deleted once the sound has finished playing. - */ - void playSound (AudioFormatReader* buffer, bool deleteWhenFinished = false); - - /** Plays the sound from a positionable audio source. - - This will output the sound coming from a positionable audio source. - This gives you slightly more control over the sound playback compared - to the other playSound methods. For example, if you would like to - stop the sound prematurely you can call this method with a - TransportAudioSource and then call audioSource->stop. Note that, - you must call audioSource->start to start the playback, if your - audioSource is a TransportAudioSource. - - The audio device manager will not hold any references to this audio - source once the audio source has stopped playing for any reason, - for example when the sound has finished playing or when you have - called audioSource->stop. Therefore, calling audioSource->start() on - a finished audioSource will not restart the sound again. If this is - desired simply call playSound with the same audioSource again. - - @param audioSource the audio source to play - @param deleteWhenFinished If this is true then the audio source will - be deleted once the device manager has finished playing. - */ - void playSound (PositionableAudioSource* audioSource, bool deleteWhenFinished = false); - - /** Plays the sound from an audio sample buffer. - - This will output the sound contained in an audio sample buffer. If - deleteWhenFinished is true then the audio sample buffer will be - automatically deleted once the sound has finished playing. - - If playOnAllOutputChannels is true, then if there are more output channels - than buffer channels, then the ones that are available will be re-used on - multiple outputs so that something is sent to all output channels. If it - is false, then the buffer will just be played on the first output channels. - */ - void playSound (AudioSampleBuffer* buffer, - bool deleteWhenFinished = false, - bool playOnAllOutputChannels = false); - //============================================================================== /** Turns on level-measuring for input channels. @see getCurrentInputLevel() @@ -519,6 +468,9 @@ private: ScopedPointer defaultMidiOutput; CriticalSection audioCallbackLock, midiCallbackLock; + ScopedPointer testSound; + int testSoundPosition; + double cpuUsageMs, timeToCpuScale; struct LevelMeter diff --git a/modules/juce_audio_devices/juce_audio_devices.cpp b/modules/juce_audio_devices/juce_audio_devices.cpp index 86669c04..972f2214 100644 --- a/modules/juce_audio_devices/juce_audio_devices.cpp +++ b/modules/juce_audio_devices/juce_audio_devices.cpp @@ -45,7 +45,6 @@ #define Component CarbonDummyCompName #import #import - #import #import #undef Point #undef Component @@ -88,15 +87,6 @@ #include #endif - #if JUCE_USE_CDBURNER - /* You'll need the Platform SDK for these headers - if you don't have it and don't - need to use CD-burning, then you might just want to set the JUCE_USE_CDBURNER flag - to 0, to avoid these includes. - */ - #include - #include - #endif - //============================================================================== #elif JUCE_LINUX #if JUCE_ALSA @@ -143,7 +133,6 @@ namespace juce #include "audio_io/juce_AudioIODeviceType.cpp" #include "midi_io/juce_MidiMessageCollector.cpp" #include "midi_io/juce_MidiOutput.cpp" -#include "audio_cd/juce_AudioCDReader.cpp" #include "sources/juce_AudioSourcePlayer.cpp" #include "sources/juce_AudioTransportSource.cpp" #include "native/juce_MidiDataConcatenator.h" @@ -153,14 +142,6 @@ namespace juce #include "native/juce_mac_CoreAudio.cpp" #include "native/juce_mac_CoreMidi.cpp" - #if JUCE_USE_CDREADER - #include "native/juce_mac_AudioCDReader.mm" - #endif - - #if JUCE_USE_CDBURNER - #include "native/juce_mac_AudioCDBurner.mm" - #endif - //============================================================================== #elif JUCE_IOS #include "native/juce_ios_Audio.cpp" @@ -183,14 +164,6 @@ namespace juce #include "native/juce_win32_ASIO.cpp" #endif - #if JUCE_USE_CDREADER - #include "native/juce_win32_AudioCDReader.cpp" - #endif - - #if JUCE_USE_CDBURNER - #include "native/juce_win32_AudioCDBurner.cpp" - #endif - //============================================================================== #elif JUCE_LINUX #if JUCE_ALSA @@ -203,10 +176,6 @@ namespace juce #include "native/juce_linux_JackAudio.cpp" #endif - #if JUCE_USE_CDREADER - #include "native/juce_linux_AudioCDReader.cpp" - #endif - //============================================================================== #elif JUCE_ANDROID #include "native/juce_android_Audio.cpp" diff --git a/modules/juce_audio_devices/juce_audio_devices.h b/modules/juce_audio_devices/juce_audio_devices.h index bdb0c24e..0fe52979 100644 --- a/modules/juce_audio_devices/juce_audio_devices.h +++ b/modules/juce_audio_devices/juce_audio_devices.h @@ -33,14 +33,14 @@ ID: juce_audio_devices vendor: juce - version: 4.2.4 + version: 4.3.0 name: JUCE audio and MIDI I/O device classes description: Classes to play and record from audio and MIDI I/O devices website: http://www.juce.com/juce license: GPL/Commercial - dependencies: juce_audio_basics, juce_audio_formats, juce_events - OSXFrameworks: CoreAudio CoreMIDI DiscRecording + dependencies: juce_audio_basics, juce_events + OSXFrameworks: CoreAudio CoreMIDI AudioToolbox iOSFrameworks: CoreAudio CoreMIDI AudioToolbox AVFoundation linuxPackages: alsa mingwLibs: winmm @@ -55,7 +55,6 @@ #include #include -#include //============================================================================== /** Config: JUCE_ASIO @@ -118,21 +117,6 @@ #endif #endif -//============================================================================== -/** Config: JUCE_USE_CDREADER - Enables the AudioCDReader class (on supported platforms). -*/ -#ifndef JUCE_USE_CDREADER - #define JUCE_USE_CDREADER 0 -#endif - -/** Config: JUCE_USE_CDBURNER - Enables the AudioCDBurner class (on supported platforms). -*/ -#ifndef JUCE_USE_CDBURNER - #define JUCE_USE_CDBURNER 0 -#endif - //============================================================================== namespace juce { @@ -145,8 +129,6 @@ namespace juce #include "midi_io/juce_MidiOutput.h" #include "sources/juce_AudioSourcePlayer.h" #include "sources/juce_AudioTransportSource.h" -#include "audio_cd/juce_AudioCDBurner.h" -#include "audio_cd/juce_AudioCDReader.h" #include "audio_io/juce_AudioDeviceManager.h" } diff --git a/modules/juce_audio_devices/native/juce_linux_AudioCDReader.cpp b/modules/juce_audio_devices/native/juce_linux_AudioCDReader.cpp deleted file mode 100644 index 938486b6..00000000 --- a/modules/juce_audio_devices/native/juce_linux_AudioCDReader.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library. - Copyright (c) 2015 - ROLI Ltd. - - Permission is granted to use this software under the terms of either: - a) the GPL v2 (or any later version) - b) the Affero GPL v3 - - Details of these licenses can be found at: www.gnu.org/licenses - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.juce.com for more information. - - ============================================================================== -*/ - -AudioCDReader::AudioCDReader() - : AudioFormatReader (0, "CD Audio") -{ -} - -StringArray AudioCDReader::getAvailableCDNames() -{ - StringArray names; - return names; -} - -AudioCDReader* AudioCDReader::createReaderForCD (const int index) -{ - return nullptr; -} - -AudioCDReader::~AudioCDReader() -{ -} - -void AudioCDReader::refreshTrackLengths() -{ -} - -bool AudioCDReader::readSamples (int** destSamples, int numDestChannels, int startOffsetInDestBuffer, - int64 startSampleInFile, int numSamples) -{ - return false; -} - -bool AudioCDReader::isCDStillPresent() const -{ - return false; -} - -bool AudioCDReader::isTrackAudio (int trackNum) const -{ - return false; -} - -void AudioCDReader::enableIndexScanning (bool b) -{ -} - -int AudioCDReader::getLastIndex() const -{ - return 0; -} - -Array AudioCDReader::findIndexesInTrack (const int trackNumber) -{ - return Array(); -} diff --git a/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm b/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm deleted file mode 100644 index 84b25404..00000000 --- a/modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm +++ /dev/null @@ -1,455 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library. - Copyright (c) 2015 - ROLI Ltd. - - Permission is granted to use this software under the terms of either: - a) the GPL v2 (or any later version) - b) the Affero GPL v3 - - Details of these licenses can be found at: www.gnu.org/licenses - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.juce.com for more information. - - ============================================================================== -*/ - -const int kilobytesPerSecond1x = 176; - -struct AudioTrackProducerClass : public ObjCClass -{ - AudioTrackProducerClass() : ObjCClass ("JUCEAudioTrackProducer_") - { - addIvar ("source"); - - addMethod (@selector (initWithAudioSourceHolder:), initWithAudioSourceHolder, "@@:^v"); - addMethod (@selector (cleanupTrackAfterBurn:), cleanupTrackAfterBurn, "v@:@"); - addMethod (@selector (cleanupTrackAfterVerification:), cleanupTrackAfterVerification, "c@:@"); - addMethod (@selector (estimateLengthOfTrack:), estimateLengthOfTrack, "Q@:@"); - addMethod (@selector (prepareTrack:forBurn:toMedia:), prepareTrack, "c@:@@@"); - addMethod (@selector (prepareTrackForVerification:), prepareTrackForVerification, "c@:@"); - addMethod (@selector (produceDataForTrack:intoBuffer:length:atAddress:blockSize:ioFlags:), - produceDataForTrack, "I@:@^cIQI^I"); - addMethod (@selector (producePreGapForTrack:intoBuffer:length:atAddress:blockSize:ioFlags:), - produceDataForTrack, "I@:@^cIQI^I"); - addMethod (@selector (verifyDataForTrack:intoBuffer:length:atAddress:blockSize:ioFlags:), - produceDataForTrack, "I@:@^cIQI^I"); - - registerClass(); - } - - struct AudioSourceHolder - { - AudioSourceHolder (AudioSource* s, int numFrames) - : source (s), readPosition (0), lengthInFrames (numFrames) - { - } - - ~AudioSourceHolder() - { - if (source != nullptr) - source->releaseResources(); - } - - ScopedPointer source; - int readPosition, lengthInFrames; - }; - -private: - static id initWithAudioSourceHolder (id self, SEL, AudioSourceHolder* source) - { - self = sendSuperclassMessage (self, @selector (init)); - object_setInstanceVariable (self, "source", source); - return self; - } - - static AudioSourceHolder* getSource (id self) - { - return getIvar (self, "source"); - } - - static void dealloc (id self, SEL) - { - delete getSource (self); - sendSuperclassMessage (self, @selector (dealloc)); - } - - static void cleanupTrackAfterBurn (id self, SEL, DRTrack*) {} - static BOOL cleanupTrackAfterVerification (id self, SEL, DRTrack*) { return true; } - - static uint64_t estimateLengthOfTrack (id self, SEL, DRTrack*) - { - return getSource (self)->lengthInFrames; - } - - static BOOL prepareTrack (id self, SEL, DRTrack*, DRBurn*, NSDictionary*) - { - if (AudioSourceHolder* const source = getSource (self)) - { - source->source->prepareToPlay (44100 / 75, 44100); - source->readPosition = 0; - } - - return true; - } - - static BOOL prepareTrackForVerification (id self, SEL, DRTrack*) - { - if (AudioSourceHolder* const source = getSource (self)) - source->source->prepareToPlay (44100 / 75, 44100); - - return true; - } - - static uint32_t produceDataForTrack (id self, SEL, DRTrack*, char* buffer, - uint32_t bufferLength, uint64_t /*address*/, - uint32_t /*blockSize*/, uint32_t* /*flags*/) - { - if (AudioSourceHolder* const source = getSource (self)) - { - const int numSamples = jmin ((int) bufferLength / 4, - (source->lengthInFrames * (44100 / 75)) - source->readPosition); - - if (numSamples > 0) - { - AudioSampleBuffer tempBuffer (2, numSamples); - AudioSourceChannelInfo info (tempBuffer); - - source->source->getNextAudioBlock (info); - - typedef AudioData::Pointer CDSampleFormat; - typedef AudioData::Pointer SourceSampleFormat; - - CDSampleFormat left (buffer, 2); - left.convertSamples (SourceSampleFormat (tempBuffer.getReadPointer (0)), numSamples); - CDSampleFormat right (buffer + 2, 2); - right.convertSamples (SourceSampleFormat (tempBuffer.getReadPointer (1)), numSamples); - - source->readPosition += numSamples; - } - - return numSamples * 4; - } - - return 0; - } - - static uint32_t producePreGapForTrack (id self, SEL, DRTrack*, char* buffer, - uint32_t bufferLength, uint64_t /*address*/, - uint32_t /*blockSize*/, uint32_t* /*flags*/) - { - zeromem (buffer, bufferLength); - return bufferLength; - } - - static BOOL verifyDataForTrack (id self, SEL, DRTrack*, const char*, - uint32_t /*bufferLength*/, uint64_t /*address*/, - uint32_t /*blockSize*/, uint32_t* /*flags*/) - { - return true; - } -}; - -struct OpenDiskDevice -{ - OpenDiskDevice (DRDevice* d) - : device (d), - tracks ([[NSMutableArray alloc] init]), - underrunProtection (true) - { - } - - ~OpenDiskDevice() - { - [tracks release]; - } - - void addSourceTrack (AudioSource* source, int numSamples) - { - if (source != nullptr) - { - const int numFrames = (numSamples + 587) / 588; - - static AudioTrackProducerClass cls; - - NSObject* producer = [cls.createInstance() performSelector: @selector (initWithAudioSourceHolder:) - withObject: (id) new AudioTrackProducerClass::AudioSourceHolder (source, numFrames)]; - DRTrack* track = [[DRTrack alloc] initWithProducer: producer]; - - { - NSMutableDictionary* p = [[track properties] mutableCopy]; - [p setObject: [DRMSF msfWithFrames: numFrames] forKey: DRTrackLengthKey]; - [p setObject: [NSNumber numberWithUnsignedShort: 2352] forKey: DRBlockSizeKey]; - [p setObject: [NSNumber numberWithInt: 0] forKey: DRDataFormKey]; - [p setObject: [NSNumber numberWithInt: 0] forKey: DRBlockTypeKey]; - [p setObject: [NSNumber numberWithInt: 0] forKey: DRTrackModeKey]; - [p setObject: [NSNumber numberWithInt: 0] forKey: DRSessionFormatKey]; - [track setProperties: p]; - [p release]; - } - - [tracks addObject: track]; - - [track release]; - [producer release]; - } - } - - String burn (AudioCDBurner::BurnProgressListener* listener, - bool shouldEject, bool peformFakeBurnForTesting, int burnSpeed) - { - DRBurn* burn = [DRBurn burnForDevice: device]; - - if (! [device acquireExclusiveAccess]) - return "Couldn't open or write to the CD device"; - - [device acquireMediaReservation]; - - NSMutableDictionary* d = [[burn properties] mutableCopy]; - [d autorelease]; - [d setObject: [NSNumber numberWithBool: peformFakeBurnForTesting] forKey: DRBurnTestingKey]; - [d setObject: [NSNumber numberWithBool: false] forKey: DRBurnVerifyDiscKey]; - [d setObject: (shouldEject ? DRBurnCompletionActionEject : DRBurnCompletionActionMount) forKey: DRBurnCompletionActionKey]; - - if (burnSpeed > 0) - [d setObject: [NSNumber numberWithFloat: burnSpeed * kilobytesPerSecond1x] forKey: DRBurnRequestedSpeedKey]; - - if (! underrunProtection) - [d setObject: [NSNumber numberWithBool: false] forKey: DRBurnUnderrunProtectionKey]; - - [burn setProperties: d]; - - [burn writeLayout: tracks]; - - for (;;) - { - Thread::sleep (300); - float progress = [[[burn status] objectForKey: DRStatusPercentCompleteKey] floatValue]; - - if (listener != nullptr && listener->audioCDBurnProgress (progress)) - { - [burn abort]; - return "User cancelled the write operation"; - } - - if ([[[burn status] objectForKey: DRStatusStateKey] isEqualTo: DRStatusStateFailed]) - return "Write operation failed"; - - if ([[[burn status] objectForKey: DRStatusStateKey] isEqualTo: DRStatusStateDone]) - break; - - NSString* err = (NSString*) [[[burn status] objectForKey: DRErrorStatusKey] - objectForKey: DRErrorStatusErrorStringKey]; - if ([err length] > 0) - return nsStringToJuce (err); - } - - [device releaseMediaReservation]; - [device releaseExclusiveAccess]; - return String(); - } - - DRDevice* device; - NSMutableArray* tracks; - bool underrunProtection; -}; - -//============================================================================== -class AudioCDBurner::Pimpl : public Timer -{ -public: - Pimpl (AudioCDBurner& b, int deviceIndex) : owner (b) - { - if (DRDevice* dev = [[DRDevice devices] objectAtIndex: deviceIndex]) - { - device = new OpenDiskDevice (dev); - lastState = getDiskState(); - startTimer (1000); - } - } - - ~Pimpl() - { - stopTimer(); - } - - void timerCallback() override - { - const DiskState state = getDiskState(); - - if (state != lastState) - { - lastState = state; - owner.sendChangeMessage(); - } - } - - DiskState getDiskState() const - { - if ([device->device isValid]) - { - NSDictionary* status = [device->device status]; - NSString* state = [status objectForKey: DRDeviceMediaStateKey]; - - if ([state isEqualTo: DRDeviceMediaStateNone]) - { - if ([[status objectForKey: DRDeviceIsTrayOpenKey] boolValue]) - return trayOpen; - - return noDisc; - } - - if ([state isEqualTo: DRDeviceMediaStateMediaPresent]) - { - if ([[[status objectForKey: DRDeviceMediaInfoKey] objectForKey: DRDeviceMediaBlocksFreeKey] intValue] > 0) - return writableDiskPresent; - - return readOnlyDiskPresent; - } - } - - return unknown; - } - - bool openTray() { return [device->device isValid] && [device->device ejectMedia]; } - - Array getAvailableWriteSpeeds() const - { - Array results; - - if ([device->device isValid]) - for (id kbPerSec in [[[device->device status] objectForKey: DRDeviceMediaInfoKey] objectForKey: DRDeviceBurnSpeedsKey]) - results.add ([kbPerSec intValue] / kilobytesPerSecond1x); - - return results; - } - - bool setBufferUnderrunProtection (const bool shouldBeEnabled) - { - if ([device->device isValid]) - { - device->underrunProtection = shouldBeEnabled; - return shouldBeEnabled && [[[device->device status] objectForKey: DRDeviceCanUnderrunProtectCDKey] boolValue]; - } - - return false; - } - - int getNumAvailableAudioBlocks() const - { - return [[[[device->device status] objectForKey: DRDeviceMediaInfoKey] - objectForKey: DRDeviceMediaBlocksFreeKey] intValue]; - } - - ScopedPointer device; - -private: - DiskState lastState; - AudioCDBurner& owner; -}; - -//============================================================================== -AudioCDBurner::AudioCDBurner (const int deviceIndex) -{ - pimpl = new Pimpl (*this, deviceIndex); -} - -AudioCDBurner::~AudioCDBurner() -{ -} - -AudioCDBurner* AudioCDBurner::openDevice (const int deviceIndex) -{ - ScopedPointer b (new AudioCDBurner (deviceIndex)); - - if (b->pimpl->device == nil) - b = nullptr; - - return b.release(); -} - -StringArray AudioCDBurner::findAvailableDevices() -{ - StringArray s; - - for (NSDictionary* dic in [DRDevice devices]) - if (NSString* name = [dic valueForKey: DRDeviceProductNameKey]) - s.add (nsStringToJuce (name)); - - return s; -} - -AudioCDBurner::DiskState AudioCDBurner::getDiskState() const -{ - return pimpl->getDiskState(); -} - -bool AudioCDBurner::isDiskPresent() const -{ - return getDiskState() == writableDiskPresent; -} - -bool AudioCDBurner::openTray() -{ - return pimpl->openTray(); -} - -AudioCDBurner::DiskState AudioCDBurner::waitUntilStateChange (int timeOutMilliseconds) -{ - const int64 timeout = Time::currentTimeMillis() + timeOutMilliseconds; - DiskState oldState = getDiskState(); - DiskState newState = oldState; - - while (newState == oldState && Time::currentTimeMillis() < timeout) - { - newState = getDiskState(); - Thread::sleep (100); - } - - return newState; -} - -Array AudioCDBurner::getAvailableWriteSpeeds() const -{ - return pimpl->getAvailableWriteSpeeds(); -} - -bool AudioCDBurner::setBufferUnderrunProtection (const bool shouldBeEnabled) -{ - return pimpl->setBufferUnderrunProtection (shouldBeEnabled); -} - -int AudioCDBurner::getNumAvailableAudioBlocks() const -{ - return pimpl->getNumAvailableAudioBlocks(); -} - -bool AudioCDBurner::addAudioTrack (AudioSource* source, int numSamps) -{ - if ([pimpl->device->device isValid]) - { - pimpl->device->addSourceTrack (source, numSamps); - return true; - } - - return false; -} - -String AudioCDBurner::burn (AudioCDBurner::BurnProgressListener* listener, - bool ejectDiscAfterwards, - bool performFakeBurnForTesting, - int writeSpeed) -{ - if ([pimpl->device->device isValid]) - return pimpl->device->burn (listener, ejectDiscAfterwards, performFakeBurnForTesting, writeSpeed); - - return "Couldn't open or write to the CD device"; -} diff --git a/modules/juce_audio_devices/native/juce_mac_AudioCDReader.mm b/modules/juce_audio_devices/native/juce_mac_AudioCDReader.mm deleted file mode 100644 index a67d3cf5..00000000 --- a/modules/juce_audio_devices/native/juce_mac_AudioCDReader.mm +++ /dev/null @@ -1,260 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library. - Copyright (c) 2015 - ROLI Ltd. - - Permission is granted to use this software under the terms of either: - a) the GPL v2 (or any later version) - b) the Affero GPL v3 - - Details of these licenses can be found at: www.gnu.org/licenses - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.juce.com for more information. - - ============================================================================== -*/ - -namespace CDReaderHelpers -{ - inline const XmlElement* getElementForKey (const XmlElement& xml, const String& key) - { - forEachXmlChildElementWithTagName (xml, child, "key") - if (child->getAllSubText().trim() == key) - return child->getNextElement(); - - return nullptr; - } - - static int getIntValueForKey (const XmlElement& xml, const String& key, int defaultValue = -1) - { - const XmlElement* const block = getElementForKey (xml, key); - return block != nullptr ? block->getAllSubText().trim().getIntValue() : defaultValue; - } - - // Get the track offsets for a CD given an XmlElement representing its TOC.Plist. - // Returns NULL on success, otherwise a const char* representing an error. - static const char* getTrackOffsets (XmlDocument& xmlDocument, Array& offsets) - { - const ScopedPointer xml (xmlDocument.getDocumentElement()); - if (xml == nullptr) - return "Couldn't parse XML in file"; - - const XmlElement* const dict = xml->getChildByName ("dict"); - if (dict == nullptr) - return "Couldn't get top level dictionary"; - - const XmlElement* const sessions = getElementForKey (*dict, "Sessions"); - if (sessions == nullptr) - return "Couldn't find sessions key"; - - const XmlElement* const session = sessions->getFirstChildElement(); - if (session == nullptr) - return "Couldn't find first session"; - - const int leadOut = getIntValueForKey (*session, "Leadout Block"); - if (leadOut < 0) - return "Couldn't find Leadout Block"; - - const XmlElement* const trackArray = getElementForKey (*session, "Track Array"); - if (trackArray == nullptr) - return "Couldn't find Track Array"; - - forEachXmlChildElement (*trackArray, track) - { - const int trackValue = getIntValueForKey (*track, "Start Block"); - if (trackValue < 0) - return "Couldn't find Start Block in the track"; - - offsets.add (trackValue * AudioCDReader::samplesPerFrame - 88200); - } - - offsets.add (leadOut * AudioCDReader::samplesPerFrame - 88200); - return nullptr; - } - - static void findDevices (Array& cds) - { - File volumes ("/Volumes"); - volumes.findChildFiles (cds, File::findDirectories, false); - - for (int i = cds.size(); --i >= 0;) - if (! cds.getReference(i).getChildFile (".TOC.plist").exists()) - cds.remove (i); - } - - struct TrackSorter - { - static int getCDTrackNumber (const File& file) - { - return file.getFileName().initialSectionContainingOnly ("0123456789").getIntValue(); - } - - static int compareElements (const File& first, const File& second) - { - const int firstTrack = getCDTrackNumber (first); - const int secondTrack = getCDTrackNumber (second); - - jassert (firstTrack > 0 && secondTrack > 0); - - return firstTrack - secondTrack; - } - }; -} - -//============================================================================== -StringArray AudioCDReader::getAvailableCDNames() -{ - Array cds; - CDReaderHelpers::findDevices (cds); - - StringArray names; - - for (int i = 0; i < cds.size(); ++i) - names.add (cds.getReference(i).getFileName()); - - return names; -} - -AudioCDReader* AudioCDReader::createReaderForCD (const int index) -{ - Array cds; - CDReaderHelpers::findDevices (cds); - - if (cds[index].exists()) - return new AudioCDReader (cds[index]); - - return nullptr; -} - -AudioCDReader::AudioCDReader (const File& volume) - : AudioFormatReader (0, "CD Audio"), - volumeDir (volume), - currentReaderTrack (-1) -{ - sampleRate = 44100.0; - bitsPerSample = 16; - numChannels = 2; - usesFloatingPointData = false; - - refreshTrackLengths(); -} - -AudioCDReader::~AudioCDReader() -{ -} - -void AudioCDReader::refreshTrackLengths() -{ - tracks.clear(); - trackStartSamples.clear(); - lengthInSamples = 0; - - volumeDir.findChildFiles (tracks, File::findFiles | File::ignoreHiddenFiles, false, "*.aiff"); - - CDReaderHelpers::TrackSorter sorter; - tracks.sort (sorter); - - const File toc (volumeDir.getChildFile (".TOC.plist")); - - if (toc.exists()) - { - XmlDocument doc (toc); - const char* error = CDReaderHelpers::getTrackOffsets (doc, trackStartSamples); - ignoreUnused (error); // could be logged.. - - lengthInSamples = trackStartSamples.getLast() - trackStartSamples.getFirst(); - } -} - -bool AudioCDReader::readSamples (int** destSamples, int numDestChannels, int startOffsetInDestBuffer, - int64 startSampleInFile, int numSamples) -{ - while (numSamples > 0) - { - int track = -1; - - for (int i = 0; i < trackStartSamples.size() - 1; ++i) - { - if (startSampleInFile < trackStartSamples.getUnchecked (i + 1)) - { - track = i; - break; - } - } - - if (track < 0) - return false; - - if (track != currentReaderTrack) - { - reader = nullptr; - - if (FileInputStream* const in = tracks [track].createInputStream()) - { - BufferedInputStream* const bin = new BufferedInputStream (in, 65536, true); - - AiffAudioFormat format; - reader = format.createReaderFor (bin, true); - - if (reader == nullptr) - currentReaderTrack = -1; - else - currentReaderTrack = track; - } - } - - if (reader == nullptr) - return false; - - const int startPos = (int) (startSampleInFile - trackStartSamples.getUnchecked (track)); - const int numAvailable = (int) jmin ((int64) numSamples, reader->lengthInSamples - startPos); - - reader->readSamples (destSamples, numDestChannels, startOffsetInDestBuffer, startPos, numAvailable); - - numSamples -= numAvailable; - startSampleInFile += numAvailable; - } - - return true; -} - -bool AudioCDReader::isCDStillPresent() const -{ - return volumeDir.exists(); -} - -void AudioCDReader::ejectDisk() -{ - JUCE_AUTORELEASEPOOL - { - [[NSWorkspace sharedWorkspace] unmountAndEjectDeviceAtPath: juceStringToNS (volumeDir.getFullPathName())]; - } -} - -bool AudioCDReader::isTrackAudio (int trackNum) const -{ - return tracks [trackNum].hasFileExtension (".aiff"); -} - -void AudioCDReader::enableIndexScanning (bool) -{ - // any way to do this on a Mac?? -} - -int AudioCDReader::getLastIndex() const -{ - return 0; -} - -Array AudioCDReader::findIndexesInTrack (const int /*trackNumber*/) -{ - return Array(); -} diff --git a/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp b/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp deleted file mode 100644 index 997484f2..00000000 --- a/modules/juce_audio_devices/native/juce_win32_AudioCDBurner.cpp +++ /dev/null @@ -1,411 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library. - Copyright (c) 2015 - ROLI Ltd. - - Permission is granted to use this software under the terms of either: - a) the GPL v2 (or any later version) - b) the Affero GPL v3 - - Details of these licenses can be found at: www.gnu.org/licenses - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.juce.com for more information. - - ============================================================================== -*/ - -namespace CDBurnerHelpers -{ - IDiscRecorder* enumCDBurners (StringArray* list, int indexToOpen, IDiscMaster** master) - { - CoInitialize (0); - - IDiscMaster* dm; - IDiscRecorder* result = nullptr; - - if (SUCCEEDED (CoCreateInstance (CLSID_MSDiscMasterObj, 0, - CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, - IID_IDiscMaster, - (void**) &dm))) - { - if (SUCCEEDED (dm->Open())) - { - IEnumDiscRecorders* drEnum = nullptr; - - if (SUCCEEDED (dm->EnumDiscRecorders (&drEnum))) - { - IDiscRecorder* dr = nullptr; - DWORD dummy; - int index = 0; - - while (drEnum->Next (1, &dr, &dummy) == S_OK) - { - if (indexToOpen == index) - { - result = dr; - break; - } - else if (list != nullptr) - { - BSTR path; - - if (SUCCEEDED (dr->GetPath (&path))) - list->add ((const WCHAR*) path); - } - - ++index; - dr->Release(); - } - - drEnum->Release(); - } - - if (master == 0) - dm->Close(); - } - - if (master != nullptr) - *master = dm; - else - dm->Release(); - } - - return result; - } -} - -//============================================================================== -class AudioCDBurner::Pimpl : public ComBaseClassHelper , - public Timer -{ -public: - Pimpl (AudioCDBurner& owner_, IDiscMaster* discMaster_, IDiscRecorder* discRecorder_) - : owner (owner_), discMaster (discMaster_), discRecorder (discRecorder_), redbook (0), - listener (0), progress (0), shouldCancel (false) - { - HRESULT hr = discMaster->SetActiveDiscMasterFormat (IID_IRedbookDiscMaster, (void**) &redbook); - jassert (SUCCEEDED (hr)); - hr = discMaster->SetActiveDiscRecorder (discRecorder); - //jassert (SUCCEEDED (hr)); - - lastState = getDiskState(); - startTimer (2000); - } - - ~Pimpl() {} - - void releaseObjects() - { - discRecorder->Close(); - if (redbook != nullptr) - redbook->Release(); - discRecorder->Release(); - discMaster->Release(); - Release(); - } - - JUCE_COMRESULT QueryCancel (boolean* pbCancel) - { - if (listener != nullptr && ! shouldCancel) - shouldCancel = listener->audioCDBurnProgress (progress); - - *pbCancel = shouldCancel; - - return S_OK; - } - - JUCE_COMRESULT NotifyBlockProgress (long nCompleted, long nTotal) - { - progress = nCompleted / (float) nTotal; - shouldCancel = listener != nullptr && listener->audioCDBurnProgress (progress); - - return E_NOTIMPL; - } - - JUCE_COMRESULT NotifyPnPActivity (void) { return E_NOTIMPL; } - JUCE_COMRESULT NotifyAddProgress (long /*nCompletedSteps*/, long /*nTotalSteps*/) { return E_NOTIMPL; } - JUCE_COMRESULT NotifyTrackProgress (long /*nCurrentTrack*/, long /*nTotalTracks*/) { return E_NOTIMPL; } - JUCE_COMRESULT NotifyPreparingBurn (long /*nEstimatedSeconds*/) { return E_NOTIMPL; } - JUCE_COMRESULT NotifyClosingDisc (long /*nEstimatedSeconds*/) { return E_NOTIMPL; } - JUCE_COMRESULT NotifyBurnComplete (HRESULT /*status*/) { return E_NOTIMPL; } - JUCE_COMRESULT NotifyEraseComplete (HRESULT /*status*/) { return E_NOTIMPL; } - - class ScopedDiscOpener - { - public: - ScopedDiscOpener (Pimpl& p) : pimpl (p) { pimpl.discRecorder->OpenExclusive(); } - ~ScopedDiscOpener() { pimpl.discRecorder->Close(); } - - private: - Pimpl& pimpl; - - JUCE_DECLARE_NON_COPYABLE (ScopedDiscOpener) - }; - - DiskState getDiskState() - { - const ScopedDiscOpener opener (*this); - - long type, flags; - HRESULT hr = discRecorder->QueryMediaType (&type, &flags); - - if (FAILED (hr)) - return unknown; - - if (type != 0 && (flags & MEDIA_WRITABLE) != 0) - return writableDiskPresent; - - if (type == 0) - return noDisc; - - return readOnlyDiskPresent; - } - - int getIntProperty (const LPOLESTR name, const int defaultReturn) const - { - ComSmartPtr prop; - if (FAILED (discRecorder->GetRecorderProperties (prop.resetAndGetPointerAddress()))) - return defaultReturn; - - PROPSPEC iPropSpec; - iPropSpec.ulKind = PRSPEC_LPWSTR; - iPropSpec.lpwstr = name; - - PROPVARIANT iPropVariant; - return FAILED (prop->ReadMultiple (1, &iPropSpec, &iPropVariant)) - ? defaultReturn : (int) iPropVariant.lVal; - } - - bool setIntProperty (const LPOLESTR name, const int value) const - { - ComSmartPtr prop; - if (FAILED (discRecorder->GetRecorderProperties (prop.resetAndGetPointerAddress()))) - return false; - - PROPSPEC iPropSpec; - iPropSpec.ulKind = PRSPEC_LPWSTR; - iPropSpec.lpwstr = name; - - PROPVARIANT iPropVariant; - if (FAILED (prop->ReadMultiple (1, &iPropSpec, &iPropVariant))) - return false; - - iPropVariant.lVal = (long) value; - return SUCCEEDED (prop->WriteMultiple (1, &iPropSpec, &iPropVariant, iPropVariant.vt)) - && SUCCEEDED (discRecorder->SetRecorderProperties (prop)); - } - - void timerCallback() override - { - const DiskState state = getDiskState(); - - if (state != lastState) - { - lastState = state; - owner.sendChangeMessage(); - } - } - - AudioCDBurner& owner; - DiskState lastState; - IDiscMaster* discMaster; - IDiscRecorder* discRecorder; - IRedbookDiscMaster* redbook; - AudioCDBurner::BurnProgressListener* listener; - float progress; - bool shouldCancel; -}; - -//============================================================================== -AudioCDBurner::AudioCDBurner (const int deviceIndex) -{ - IDiscMaster* discMaster = nullptr; - IDiscRecorder* discRecorder = CDBurnerHelpers::enumCDBurners (0, deviceIndex, &discMaster); - - if (discRecorder != nullptr) - pimpl = new Pimpl (*this, discMaster, discRecorder); -} - -AudioCDBurner::~AudioCDBurner() -{ - if (pimpl != nullptr) - pimpl.release()->releaseObjects(); -} - -StringArray AudioCDBurner::findAvailableDevices() -{ - StringArray devs; - CDBurnerHelpers::enumCDBurners (&devs, -1, 0); - return devs; -} - -AudioCDBurner* AudioCDBurner::openDevice (const int deviceIndex) -{ - ScopedPointer b (new AudioCDBurner (deviceIndex)); - - if (b->pimpl == 0) - b = nullptr; - - return b.release(); -} - -AudioCDBurner::DiskState AudioCDBurner::getDiskState() const -{ - return pimpl->getDiskState(); -} - -bool AudioCDBurner::isDiskPresent() const -{ - return getDiskState() == writableDiskPresent; -} - -bool AudioCDBurner::openTray() -{ - const Pimpl::ScopedDiscOpener opener (*pimpl); - return SUCCEEDED (pimpl->discRecorder->Eject()); -} - -AudioCDBurner::DiskState AudioCDBurner::waitUntilStateChange (int timeOutMilliseconds) -{ - const int64 timeout = Time::currentTimeMillis() + timeOutMilliseconds; - DiskState oldState = getDiskState(); - DiskState newState = oldState; - - while (newState == oldState && Time::currentTimeMillis() < timeout) - { - newState = getDiskState(); - Thread::sleep (jmin (250, (int) (timeout - Time::currentTimeMillis()))); - } - - return newState; -} - -Array AudioCDBurner::getAvailableWriteSpeeds() const -{ - Array results; - const int maxSpeed = pimpl->getIntProperty (L"MaxWriteSpeed", 1); - const int speeds[] = { 1, 2, 4, 8, 12, 16, 20, 24, 32, 40, 64, 80 }; - - for (int i = 0; i < numElementsInArray (speeds); ++i) - if (speeds[i] <= maxSpeed) - results.add (speeds[i]); - - results.addIfNotAlreadyThere (maxSpeed); - return results; -} - -bool AudioCDBurner::setBufferUnderrunProtection (const bool shouldBeEnabled) -{ - if (pimpl->getIntProperty (L"BufferUnderrunFreeCapable", 0) == 0) - return false; - - pimpl->setIntProperty (L"EnableBufferUnderrunFree", shouldBeEnabled ? -1 : 0); - return pimpl->getIntProperty (L"EnableBufferUnderrunFree", 0) != 0; -} - -int AudioCDBurner::getNumAvailableAudioBlocks() const -{ - long blocksFree = 0; - pimpl->redbook->GetAvailableAudioTrackBlocks (&blocksFree); - return blocksFree; -} - -String AudioCDBurner::burn (AudioCDBurner::BurnProgressListener* listener, bool ejectDiscAfterwards, - bool performFakeBurnForTesting, int writeSpeed) -{ - pimpl->setIntProperty (L"WriteSpeed", writeSpeed > 0 ? writeSpeed : -1); - - pimpl->listener = listener; - pimpl->progress = 0; - pimpl->shouldCancel = false; - - UINT_PTR cookie; - HRESULT hr = pimpl->discMaster->ProgressAdvise ((AudioCDBurner::Pimpl*) pimpl, &cookie); - - hr = pimpl->discMaster->RecordDisc (performFakeBurnForTesting, - ejectDiscAfterwards); - - String error; - if (hr != S_OK) - { - const char* e = "Couldn't open or write to the CD device"; - - if (hr == IMAPI_E_USERABORT) - e = "User cancelled the write operation"; - else if (hr == IMAPI_E_MEDIUM_NOTPRESENT || hr == IMAPI_E_TRACKOPEN) - e = "No Disk present"; - - error = e; - } - - pimpl->discMaster->ProgressUnadvise (cookie); - pimpl->listener = 0; - - return error; -} - -bool AudioCDBurner::addAudioTrack (AudioSource* audioSource, int numSamples) -{ - if (audioSource == 0) - return false; - - ScopedPointer source (audioSource); - - long bytesPerBlock; - HRESULT hr = pimpl->redbook->GetAudioBlockSize (&bytesPerBlock); - - const int samplesPerBlock = bytesPerBlock / 4; - bool ok = true; - - hr = pimpl->redbook->CreateAudioTrack ((long) numSamples / (bytesPerBlock * 4)); - - HeapBlock buffer (bytesPerBlock); - AudioSampleBuffer sourceBuffer (2, samplesPerBlock); - int samplesDone = 0; - - source->prepareToPlay (samplesPerBlock, 44100.0); - - while (ok) - { - { - AudioSourceChannelInfo info (&sourceBuffer, 0, samplesPerBlock); - sourceBuffer.clear(); - - source->getNextAudioBlock (info); - } - - buffer.clear (bytesPerBlock); - - typedef AudioData::Pointer CDSampleFormat; - - typedef AudioData::Pointer SourceSampleFormat; - - CDSampleFormat left (buffer, 2); - left.convertSamples (SourceSampleFormat (sourceBuffer.getReadPointer (0)), samplesPerBlock); - CDSampleFormat right (buffer + 2, 2); - right.convertSamples (SourceSampleFormat (sourceBuffer.getReadPointer (1)), samplesPerBlock); - - hr = pimpl->redbook->AddAudioTrackBlocks (buffer, bytesPerBlock); - - if (FAILED (hr)) - ok = false; - - samplesDone += samplesPerBlock; - - if (samplesDone >= numSamples) - break; - } - - hr = pimpl->redbook->CloseAudioTrack(); - return ok && hr == S_OK; -} diff --git a/modules/juce_audio_devices/native/juce_win32_AudioCDReader.cpp b/modules/juce_audio_devices/native/juce_win32_AudioCDReader.cpp deleted file mode 100644 index ea99f80a..00000000 --- a/modules/juce_audio_devices/native/juce_win32_AudioCDReader.cpp +++ /dev/null @@ -1,1309 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library. - Copyright (c) 2015 - ROLI Ltd. - - Permission is granted to use this software under the terms of either: - a) the GPL v2 (or any later version) - b) the Affero GPL v3 - - Details of these licenses can be found at: www.gnu.org/licenses - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.juce.com for more information. - - ============================================================================== -*/ - -namespace CDReaderHelpers -{ - -#define FILE_ANY_ACCESS 0 -#ifndef FILE_READ_ACCESS - #define FILE_READ_ACCESS 1 -#endif -#ifndef FILE_WRITE_ACCESS - #define FILE_WRITE_ACCESS 2 -#endif - -#define METHOD_BUFFERED 0 -#define IOCTL_SCSI_BASE 4 -#define SCSI_IOCTL_DATA_OUT 0 -#define SCSI_IOCTL_DATA_IN 1 -#define SCSI_IOCTL_DATA_UNSPECIFIED 2 - -#define CTL_CODE2(DevType, Function, Method, Access) (((DevType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) -#define IOCTL_SCSI_PASS_THROUGH_DIRECT CTL_CODE2( IOCTL_SCSI_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS ) -#define IOCTL_SCSI_GET_ADDRESS CTL_CODE2( IOCTL_SCSI_BASE, 0x0406, METHOD_BUFFERED, FILE_ANY_ACCESS ) - -#define SENSE_LEN 14 -#define SRB_ENABLE_RESIDUAL_COUNT 0x04 -#define SRB_DIR_IN 0x08 -#define SRB_DIR_OUT 0x10 -#define SRB_EVENT_NOTIFY 0x40 -#define SC_HA_INQUIRY 0x00 -#define SC_GET_DEV_TYPE 0x01 -#define SC_EXEC_SCSI_CMD 0x02 -#define SS_PENDING 0x00 -#define SS_COMP 0x01 -#define SS_ERR 0x04 - -enum -{ - READTYPE_ANY = 0, - READTYPE_ATAPI1 = 1, - READTYPE_ATAPI2 = 2, - READTYPE_READ6 = 3, - READTYPE_READ10 = 4, - READTYPE_READ_D8 = 5, - READTYPE_READ_D4 = 6, - READTYPE_READ_D4_1 = 7, - READTYPE_READ10_2 = 8 -}; - -struct SCSI_PASS_THROUGH -{ - USHORT Length; - UCHAR ScsiStatus; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR CdbLength; - UCHAR SenseInfoLength; - UCHAR DataIn; - ULONG DataTransferLength; - ULONG TimeOutValue; - ULONG DataBufferOffset; - ULONG SenseInfoOffset; - UCHAR Cdb[16]; -}; - -struct SCSI_PASS_THROUGH_DIRECT -{ - USHORT Length; - UCHAR ScsiStatus; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR CdbLength; - UCHAR SenseInfoLength; - UCHAR DataIn; - ULONG DataTransferLength; - ULONG TimeOutValue; - PVOID DataBuffer; - ULONG SenseInfoOffset; - UCHAR Cdb[16]; -}; - -struct SCSI_PASS_THROUGH_DIRECT_WITH_BUFFER -{ - SCSI_PASS_THROUGH_DIRECT spt; - ULONG Filler; - UCHAR ucSenseBuf[32]; -}; - -struct SCSI_ADDRESS -{ - ULONG Length; - UCHAR PortNumber; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; -}; - -#pragma pack(1) - -struct SRB_GDEVBlock -{ - BYTE SRB_Cmd; - BYTE SRB_Status; - BYTE SRB_HaID; - BYTE SRB_Flags; - DWORD SRB_Hdr_Rsvd; - BYTE SRB_Target; - BYTE SRB_Lun; - BYTE SRB_DeviceType; - BYTE SRB_Rsvd1; - BYTE pad[68]; -}; - - -struct SRB_ExecSCSICmd -{ - BYTE SRB_Cmd; - BYTE SRB_Status; - BYTE SRB_HaID; - BYTE SRB_Flags; - DWORD SRB_Hdr_Rsvd; - BYTE SRB_Target; - BYTE SRB_Lun; - WORD SRB_Rsvd1; - DWORD SRB_BufLen; - BYTE *SRB_BufPointer; - BYTE SRB_SenseLen; - BYTE SRB_CDBLen; - BYTE SRB_HaStat; - BYTE SRB_TargStat; - VOID *SRB_PostProc; - BYTE SRB_Rsvd2[20]; - BYTE CDBByte[16]; - BYTE SenseArea[SENSE_LEN + 2]; -}; - -struct SRB -{ - BYTE SRB_Cmd; - BYTE SRB_Status; - BYTE SRB_HaId; - BYTE SRB_Flags; - DWORD SRB_Hdr_Rsvd; -}; - -struct TOCTRACK -{ - BYTE rsvd; - BYTE ADR; - BYTE trackNumber; - BYTE rsvd2; - BYTE addr[4]; -}; - -struct TOC -{ - WORD tocLen; - BYTE firstTrack; - BYTE lastTrack; - TOCTRACK tracks[100]; -}; - -#pragma pack() - -//============================================================================== -struct CDDeviceDescription -{ - CDDeviceDescription() : ha (0), tgt (0), lun (0), scsiDriveLetter (0) - { - } - - void createDescription (const char* data) - { - description << String (data + 8, 8).trim() // vendor - << ' ' << String (data + 16, 16).trim() // product id - << ' ' << String (data + 32, 4).trim(); // rev - } - - String description; - BYTE ha, tgt, lun; - char scsiDriveLetter; // will be 0 if not using scsi -}; - -//============================================================================== -class CDReadBuffer -{ -public: - CDReadBuffer (const int numberOfFrames) - : startFrame (0), numFrames (0), dataStartOffset (0), - dataLength (0), bufferSize (2352 * numberOfFrames), index (0), - buffer (bufferSize), wantsIndex (false) - { - } - - bool isZero() const noexcept - { - for (int i = 0; i < dataLength; ++i) - if (buffer [dataStartOffset + i] != 0) - return false; - - return true; - } - - int startFrame, numFrames, dataStartOffset; - int dataLength, bufferSize, index; - HeapBlock buffer; - bool wantsIndex; -}; - -class CDDeviceHandle; - -//============================================================================== -class CDController -{ -public: - CDController() : initialised (false) {} - virtual ~CDController() {} - - virtual bool read (CDReadBuffer&) = 0; - virtual void shutDown() {} - - bool readAudio (CDReadBuffer& rb, CDReadBuffer* overlapBuffer = 0); - int getLastIndex(); - -public: - CDDeviceHandle* deviceInfo; - int framesToCheck, framesOverlap; - bool initialised; - - void prepare (SRB_ExecSCSICmd& s); - void perform (SRB_ExecSCSICmd& s); - void setPaused (bool paused); -}; - - -//============================================================================== -class CDDeviceHandle -{ -public: - CDDeviceHandle (const CDDeviceDescription& device, HANDLE scsiHandle_) - : info (device), scsiHandle (scsiHandle_), readType (READTYPE_ANY) - { - } - - ~CDDeviceHandle() - { - if (controller != nullptr) - { - controller->shutDown(); - controller = 0; - } - - if (scsiHandle != 0) - CloseHandle (scsiHandle); - } - - bool readTOC (TOC* lpToc); - bool readAudio (CDReadBuffer& buffer, CDReadBuffer* overlapBuffer = 0); - void openDrawer (bool shouldBeOpen); - void performScsiCommand (HANDLE event, SRB_ExecSCSICmd& s); - - CDDeviceDescription info; - HANDLE scsiHandle; - BYTE readType; - -private: - ScopedPointer controller; - - bool testController (int readType, CDController* newController, CDReadBuffer& bufferToUse); -}; - -//============================================================================== -HANDLE createSCSIDeviceHandle (const char driveLetter) -{ - TCHAR devicePath[] = { '\\', '\\', '.', '\\', driveLetter, ':', 0, 0 }; - DWORD flags = GENERIC_READ | GENERIC_WRITE; - HANDLE h = CreateFile (devicePath, flags, FILE_SHARE_WRITE | FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - - if (h == INVALID_HANDLE_VALUE) - { - flags ^= GENERIC_WRITE; - h = CreateFile (devicePath, flags, FILE_SHARE_WRITE | FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - } - - return h; -} - -void findCDDevices (Array& list) -{ - for (char driveLetter = 'b'; driveLetter <= 'z'; ++driveLetter) - { - TCHAR drivePath[] = { driveLetter, ':', '\\', 0, 0 }; - - if (GetDriveType (drivePath) == DRIVE_CDROM) - { - HANDLE h = createSCSIDeviceHandle (driveLetter); - - if (h != INVALID_HANDLE_VALUE) - { - char buffer[100] = { 0 }; - - SCSI_PASS_THROUGH_DIRECT_WITH_BUFFER p = { 0 }; - p.spt.Length = sizeof (SCSI_PASS_THROUGH); - p.spt.CdbLength = 6; - p.spt.SenseInfoLength = 24; - p.spt.DataIn = SCSI_IOCTL_DATA_IN; - p.spt.DataTransferLength = sizeof (buffer); - p.spt.TimeOutValue = 2; - p.spt.DataBuffer = buffer; - p.spt.SenseInfoOffset = offsetof (SCSI_PASS_THROUGH_DIRECT_WITH_BUFFER, ucSenseBuf); - p.spt.Cdb[0] = 0x12; - p.spt.Cdb[4] = 100; - - DWORD bytesReturned = 0; - - if (DeviceIoControl (h, IOCTL_SCSI_PASS_THROUGH_DIRECT, - &p, sizeof (p), &p, sizeof (p), - &bytesReturned, 0) != 0) - { - CDDeviceDescription dev; - dev.scsiDriveLetter = driveLetter; - dev.createDescription (buffer); - - SCSI_ADDRESS scsiAddr = { 0 }; - scsiAddr.Length = sizeof (scsiAddr); - - if (DeviceIoControl (h, IOCTL_SCSI_GET_ADDRESS, - 0, 0, &scsiAddr, sizeof (scsiAddr), - &bytesReturned, 0) != 0) - { - dev.ha = scsiAddr.PortNumber; - dev.tgt = scsiAddr.TargetId; - dev.lun = scsiAddr.Lun; - list.add (dev); - } - } - - CloseHandle (h); - } - } - } -} - -DWORD performScsiPassThroughCommand (SRB_ExecSCSICmd* const srb, const char driveLetter, - HANDLE& deviceHandle, const bool retryOnFailure) -{ - SCSI_PASS_THROUGH_DIRECT_WITH_BUFFER s = { 0 }; - s.spt.Length = sizeof (SCSI_PASS_THROUGH); - s.spt.CdbLength = srb->SRB_CDBLen; - - s.spt.DataIn = (BYTE) ((srb->SRB_Flags & SRB_DIR_IN) - ? SCSI_IOCTL_DATA_IN - : ((srb->SRB_Flags & SRB_DIR_OUT) - ? SCSI_IOCTL_DATA_OUT - : SCSI_IOCTL_DATA_UNSPECIFIED)); - - s.spt.DataTransferLength = srb->SRB_BufLen; - s.spt.TimeOutValue = 5; - s.spt.DataBuffer = srb->SRB_BufPointer; - s.spt.SenseInfoOffset = offsetof (SCSI_PASS_THROUGH_DIRECT_WITH_BUFFER, ucSenseBuf); - - memcpy (s.spt.Cdb, srb->CDBByte, srb->SRB_CDBLen); - - srb->SRB_Status = SS_ERR; - srb->SRB_TargStat = 0x0004; - - DWORD bytesReturned = 0; - - if (DeviceIoControl (deviceHandle, IOCTL_SCSI_PASS_THROUGH_DIRECT, - &s, sizeof (s), &s, sizeof (s), &bytesReturned, 0) != 0) - { - srb->SRB_Status = SS_COMP; - } - else if (retryOnFailure) - { - const DWORD error = GetLastError(); - - if ((error == ERROR_MEDIA_CHANGED) || (error == ERROR_INVALID_HANDLE)) - { - if (error != ERROR_INVALID_HANDLE) - CloseHandle (deviceHandle); - - deviceHandle = createSCSIDeviceHandle (driveLetter); - - return performScsiPassThroughCommand (srb, driveLetter, deviceHandle, false); - } - } - - return srb->SRB_Status; -} - - -//============================================================================== -// Controller types.. - -class ControllerType1 : public CDController -{ -public: - ControllerType1() {} - - bool read (CDReadBuffer& rb) - { - if (rb.numFrames * 2352 > rb.bufferSize) - return false; - - SRB_ExecSCSICmd s; - prepare (s); - s.SRB_Flags = SRB_DIR_IN | SRB_EVENT_NOTIFY; - s.SRB_BufLen = rb.bufferSize; - s.SRB_BufPointer = rb.buffer; - s.SRB_CDBLen = 12; - s.CDBByte[0] = 0xBE; - s.CDBByte[3] = (BYTE) ((rb.startFrame >> 16) & 0xFF); - s.CDBByte[4] = (BYTE) ((rb.startFrame >> 8) & 0xFF); - s.CDBByte[5] = (BYTE) (rb.startFrame & 0xFF); - s.CDBByte[8] = (BYTE) (rb.numFrames & 0xFF); - s.CDBByte[9] = (BYTE) (deviceInfo->readType == READTYPE_ATAPI1 ? 0x10 : 0xF0); - perform (s); - - if (s.SRB_Status != SS_COMP) - return false; - - rb.dataLength = rb.numFrames * 2352; - rb.dataStartOffset = 0; - return true; - } -}; - -//============================================================================== -class ControllerType2 : public CDController -{ -public: - ControllerType2() {} - - void shutDown() - { - if (initialised) - { - BYTE bufPointer[] = { 0, 0, 0, 8, 83, 0, 0, 0, 0, 0, 8, 0 }; - - SRB_ExecSCSICmd s; - prepare (s); - s.SRB_Flags = SRB_EVENT_NOTIFY | SRB_ENABLE_RESIDUAL_COUNT; - s.SRB_BufLen = 0x0C; - s.SRB_BufPointer = bufPointer; - s.SRB_CDBLen = 6; - s.CDBByte[0] = 0x15; - s.CDBByte[4] = 0x0C; - perform (s); - } - } - - bool init() - { - SRB_ExecSCSICmd s; - s.SRB_Status = SS_ERR; - - if (deviceInfo->readType == READTYPE_READ10_2) - { - BYTE bufPointer1[] = { 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 9, 48, 35, 6, 0, 0, 0, 0, 0, 128 }; - BYTE bufPointer2[] = { 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 9, 48, 1, 6, 32, 7, 0, 0, 0, 0 }; - - for (int i = 0; i < 2; ++i) - { - prepare (s); - s.SRB_Flags = SRB_EVENT_NOTIFY; - s.SRB_BufLen = 0x14; - s.SRB_BufPointer = (i == 0) ? bufPointer1 : bufPointer2; - s.SRB_CDBLen = 6; - s.CDBByte[0] = 0x15; - s.CDBByte[1] = 0x10; - s.CDBByte[4] = 0x14; - perform (s); - - if (s.SRB_Status != SS_COMP) - return false; - } - } - else - { - BYTE bufPointer[] = { 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 9, 48 }; - - prepare (s); - s.SRB_Flags = SRB_EVENT_NOTIFY; - s.SRB_BufLen = 0x0C; - s.SRB_BufPointer = bufPointer; - s.SRB_CDBLen = 6; - s.CDBByte[0] = 0x15; - s.CDBByte[4] = 0x0C; - perform (s); - } - - return s.SRB_Status == SS_COMP; - } - - bool read (CDReadBuffer& rb) - { - if (rb.numFrames * 2352 > rb.bufferSize) - return false; - - if (! initialised) - { - initialised = init(); - - if (! initialised) - return false; - } - - SRB_ExecSCSICmd s; - prepare (s); - s.SRB_Flags = SRB_DIR_IN | SRB_EVENT_NOTIFY; - s.SRB_BufLen = rb.bufferSize; - s.SRB_BufPointer = rb.buffer; - s.SRB_CDBLen = 10; - s.CDBByte[0] = 0x28; - s.CDBByte[1] = (BYTE) (deviceInfo->info.lun << 5); - s.CDBByte[3] = (BYTE) ((rb.startFrame >> 16) & 0xFF); - s.CDBByte[4] = (BYTE) ((rb.startFrame >> 8) & 0xFF); - s.CDBByte[5] = (BYTE) (rb.startFrame & 0xFF); - s.CDBByte[8] = (BYTE) (rb.numFrames & 0xFF); - perform (s); - - if (s.SRB_Status != SS_COMP) - return false; - - rb.dataLength = rb.numFrames * 2352; - rb.dataStartOffset = 0; - return true; - } -}; - -//============================================================================== -class ControllerType3 : public CDController -{ -public: - ControllerType3() {} - - bool read (CDReadBuffer& rb) - { - if (rb.numFrames * 2352 > rb.bufferSize) - return false; - - if (! initialised) - { - setPaused (false); - initialised = true; - } - - SRB_ExecSCSICmd s; - prepare (s); - s.SRB_Flags = SRB_DIR_IN | SRB_EVENT_NOTIFY; - s.SRB_BufLen = rb.numFrames * 2352; - s.SRB_BufPointer = rb.buffer; - s.SRB_CDBLen = 12; - s.CDBByte[0] = 0xD8; - s.CDBByte[3] = (BYTE) ((rb.startFrame >> 16) & 0xFF); - s.CDBByte[4] = (BYTE) ((rb.startFrame >> 8) & 0xFF); - s.CDBByte[5] = (BYTE) (rb.startFrame & 0xFF); - s.CDBByte[9] = (BYTE) (rb.numFrames & 0xFF); - perform (s); - - if (s.SRB_Status != SS_COMP) - return false; - - rb.dataLength = rb.numFrames * 2352; - rb.dataStartOffset = 0; - return true; - } -}; - -//============================================================================== -class ControllerType4 : public CDController -{ -public: - ControllerType4() {} - - bool selectD4Mode() - { - BYTE bufPointer[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 48 }; - - SRB_ExecSCSICmd s; - prepare (s); - s.SRB_Flags = SRB_EVENT_NOTIFY; - s.SRB_CDBLen = 6; - s.SRB_BufLen = 12; - s.SRB_BufPointer = bufPointer; - s.CDBByte[0] = 0x15; - s.CDBByte[1] = 0x10; - s.CDBByte[4] = 0x08; - perform (s); - - return s.SRB_Status == SS_COMP; - } - - bool read (CDReadBuffer& rb) - { - if (rb.numFrames * 2352 > rb.bufferSize) - return false; - - if (! initialised) - { - setPaused (true); - - if (deviceInfo->readType == READTYPE_READ_D4_1) - selectD4Mode(); - - initialised = true; - } - - SRB_ExecSCSICmd s; - prepare (s); - s.SRB_Flags = SRB_DIR_IN | SRB_EVENT_NOTIFY; - s.SRB_BufLen = rb.bufferSize; - s.SRB_BufPointer = rb.buffer; - s.SRB_CDBLen = 10; - s.CDBByte[0] = 0xD4; - s.CDBByte[3] = (BYTE) ((rb.startFrame >> 16) & 0xFF); - s.CDBByte[4] = (BYTE) ((rb.startFrame >> 8) & 0xFF); - s.CDBByte[5] = (BYTE) (rb.startFrame & 0xFF); - s.CDBByte[8] = (BYTE) (rb.numFrames & 0xFF); - perform (s); - - if (s.SRB_Status != SS_COMP) - return false; - - rb.dataLength = rb.numFrames * 2352; - rb.dataStartOffset = 0; - return true; - } -}; - - -//============================================================================== -void CDController::prepare (SRB_ExecSCSICmd& s) -{ - zerostruct (s); - s.SRB_Cmd = SC_EXEC_SCSI_CMD; - s.SRB_HaID = deviceInfo->info.ha; - s.SRB_Target = deviceInfo->info.tgt; - s.SRB_Lun = deviceInfo->info.lun; - s.SRB_SenseLen = SENSE_LEN; -} - -void CDController::perform (SRB_ExecSCSICmd& s) -{ - s.SRB_PostProc = CreateEvent (0, TRUE, FALSE, 0); - - deviceInfo->performScsiCommand (s.SRB_PostProc, s); -} - -void CDController::setPaused (bool paused) -{ - SRB_ExecSCSICmd s; - prepare (s); - s.SRB_Flags = SRB_EVENT_NOTIFY; - s.SRB_CDBLen = 10; - s.CDBByte[0] = 0x4B; - s.CDBByte[8] = (BYTE) (paused ? 0 : 1); - perform (s); -} - -bool CDController::readAudio (CDReadBuffer& rb, CDReadBuffer* overlapBuffer) -{ - if (overlapBuffer != nullptr) - { - const bool canDoJitter = (overlapBuffer->bufferSize >= 2352 * framesToCheck); - const bool doJitter = canDoJitter && ! overlapBuffer->isZero(); - - if (doJitter - && overlapBuffer->startFrame > 0 - && overlapBuffer->numFrames > 0 - && overlapBuffer->dataLength > 0) - { - const int numFrames = rb.numFrames; - - if (overlapBuffer->startFrame == (rb.startFrame - framesToCheck)) - { - rb.startFrame -= framesOverlap; - - if (framesToCheck < framesOverlap - && numFrames + framesOverlap <= rb.bufferSize / 2352) - rb.numFrames += framesOverlap; - } - else - { - overlapBuffer->dataLength = 0; - overlapBuffer->startFrame = 0; - overlapBuffer->numFrames = 0; - } - } - - if (! read (rb)) - return false; - - if (doJitter) - { - const int checkLen = framesToCheck * 2352; - const int maxToCheck = rb.dataLength - checkLen; - - if (overlapBuffer->dataLength == 0 || overlapBuffer->isZero()) - return true; - - BYTE* const p = overlapBuffer->buffer + overlapBuffer->dataStartOffset; - bool found = false; - - for (int i = 0; i < maxToCheck; ++i) - { - if (memcmp (p, rb.buffer + i, checkLen) == 0) - { - i += checkLen; - rb.dataStartOffset = i; - rb.dataLength -= i; - rb.startFrame = overlapBuffer->startFrame + framesToCheck; - found = true; - break; - } - } - - rb.numFrames = rb.dataLength / 2352; - rb.dataLength = 2352 * rb.numFrames; - - if (! found) - return false; - } - - if (canDoJitter) - { - memcpy (overlapBuffer->buffer, - rb.buffer + rb.dataStartOffset + 2352 * (rb.numFrames - framesToCheck), - 2352 * framesToCheck); - - overlapBuffer->startFrame = rb.startFrame + rb.numFrames - framesToCheck; - overlapBuffer->numFrames = framesToCheck; - overlapBuffer->dataLength = 2352 * framesToCheck; - overlapBuffer->dataStartOffset = 0; - } - else - { - overlapBuffer->startFrame = 0; - overlapBuffer->numFrames = 0; - overlapBuffer->dataLength = 0; - } - - return true; - } - - return read (rb); -} - -int CDController::getLastIndex() -{ - char qdata[100]; - - SRB_ExecSCSICmd s; - prepare (s); - s.SRB_Flags = SRB_DIR_IN | SRB_EVENT_NOTIFY; - s.SRB_BufLen = sizeof (qdata); - s.SRB_BufPointer = (BYTE*) qdata; - s.SRB_CDBLen = 12; - s.CDBByte[0] = 0x42; - s.CDBByte[1] = (BYTE) (deviceInfo->info.lun << 5); - s.CDBByte[2] = 64; - s.CDBByte[3] = 1; // get current position - s.CDBByte[7] = 0; - s.CDBByte[8] = (BYTE) sizeof (qdata); - perform (s); - - return s.SRB_Status == SS_COMP ? qdata[7] : 0; -} - -//============================================================================== -bool CDDeviceHandle::readTOC (TOC* lpToc) -{ - SRB_ExecSCSICmd s = { 0 }; - s.SRB_Cmd = SC_EXEC_SCSI_CMD; - s.SRB_HaID = info.ha; - s.SRB_Target = info.tgt; - s.SRB_Lun = info.lun; - s.SRB_Flags = SRB_DIR_IN | SRB_EVENT_NOTIFY; - s.SRB_BufLen = 0x324; - s.SRB_BufPointer = (BYTE*) lpToc; - s.SRB_SenseLen = 0x0E; - s.SRB_CDBLen = 0x0A; - s.SRB_PostProc = CreateEvent (0, TRUE, FALSE, 0); - s.CDBByte[0] = 0x43; - s.CDBByte[1] = 0x00; - s.CDBByte[7] = 0x03; - s.CDBByte[8] = 0x24; - - performScsiCommand (s.SRB_PostProc, s); - return (s.SRB_Status == SS_COMP); -} - -void CDDeviceHandle::performScsiCommand (HANDLE event, SRB_ExecSCSICmd& s) -{ - ResetEvent (event); - DWORD status = performScsiPassThroughCommand ((SRB_ExecSCSICmd*) &s, info.scsiDriveLetter, scsiHandle, true); - - if (status == SS_PENDING) - WaitForSingleObject (event, 4000); - - CloseHandle (event); -} - -bool CDDeviceHandle::readAudio (CDReadBuffer& buffer, CDReadBuffer* overlapBuffer) -{ - if (controller == 0) - { - testController (READTYPE_ATAPI2, new ControllerType1(), buffer) - || testController (READTYPE_ATAPI1, new ControllerType1(), buffer) - || testController (READTYPE_READ10_2, new ControllerType2(), buffer) - || testController (READTYPE_READ10, new ControllerType2(), buffer) - || testController (READTYPE_READ_D8, new ControllerType3(), buffer) - || testController (READTYPE_READ_D4, new ControllerType4(), buffer) - || testController (READTYPE_READ_D4_1, new ControllerType4(), buffer); - } - - buffer.index = 0; - - if (controller != nullptr && controller->readAudio (buffer, overlapBuffer)) - { - if (buffer.wantsIndex) - buffer.index = controller->getLastIndex(); - - return true; - } - - return false; -} - -void CDDeviceHandle::openDrawer (bool shouldBeOpen) -{ - if (shouldBeOpen) - { - if (controller != nullptr) - { - controller->shutDown(); - controller = nullptr; - } - - if (scsiHandle != 0) - { - CloseHandle (scsiHandle); - scsiHandle = 0; - } - } - - SRB_ExecSCSICmd s = { 0 }; - s.SRB_Cmd = SC_EXEC_SCSI_CMD; - s.SRB_HaID = info.ha; - s.SRB_Target = info.tgt; - s.SRB_Lun = info.lun; - s.SRB_SenseLen = SENSE_LEN; - s.SRB_Flags = SRB_DIR_IN | SRB_EVENT_NOTIFY; - s.SRB_BufLen = 0; - s.SRB_BufPointer = 0; - s.SRB_CDBLen = 12; - s.CDBByte[0] = 0x1b; - s.CDBByte[1] = (BYTE) (info.lun << 5); - s.CDBByte[4] = (BYTE) (shouldBeOpen ? 2 : 3); - s.SRB_PostProc = CreateEvent (0, TRUE, FALSE, 0); - - performScsiCommand (s.SRB_PostProc, s); -} - -bool CDDeviceHandle::testController (const int type, CDController* const newController, CDReadBuffer& rb) -{ - controller = newController; - readType = (BYTE) type; - - controller->deviceInfo = this; - controller->framesToCheck = 1; - controller->framesOverlap = 3; - - bool passed = false; - memset (rb.buffer, 0xcd, rb.bufferSize); - - if (controller->read (rb)) - { - passed = true; - int* p = (int*) (rb.buffer + rb.dataStartOffset); - int wrong = 0; - - for (int i = rb.dataLength / 4; --i >= 0;) - { - if (*p++ == (int) 0xcdcdcdcd) - { - if (++wrong == 4) - { - passed = false; - break; - } - } - else - { - wrong = 0; - } - } - } - - if (! passed) - { - controller->shutDown(); - controller = nullptr; - } - - return passed; -} - - -//============================================================================== -struct CDDeviceWrapper -{ - CDDeviceWrapper (const CDDeviceDescription& device, HANDLE scsiHandle) - : deviceHandle (device, scsiHandle), overlapBuffer (3), jitter (false) - { - // xxx jitter never seemed to actually be enabled (??) - } - - CDDeviceHandle deviceHandle; - CDReadBuffer overlapBuffer; - bool jitter; -}; - -//============================================================================== -int getAddressOfTrack (const TOCTRACK& t) noexcept -{ - return (((DWORD) t.addr[0]) << 24) + (((DWORD) t.addr[1]) << 16) - + (((DWORD) t.addr[2]) << 8) + ((DWORD) t.addr[3]); -} - -const int samplesPerFrame = 44100 / 75; -const int bytesPerFrame = samplesPerFrame * 4; -const int framesPerIndexRead = 4; - -} - -//============================================================================== -StringArray AudioCDReader::getAvailableCDNames() -{ - using namespace CDReaderHelpers; - StringArray results; - - Array list; - findCDDevices (list); - - for (int i = 0; i < list.size(); ++i) - { - String s; - if (list[i].scsiDriveLetter > 0) - s << String::charToString (list[i].scsiDriveLetter).toUpperCase() << ": "; - - s << list[i].description; - results.add (s); - } - - return results; -} - -AudioCDReader* AudioCDReader::createReaderForCD (const int deviceIndex) -{ - using namespace CDReaderHelpers; - - Array list; - findCDDevices (list); - - if (isPositiveAndBelow (deviceIndex, list.size())) - { - HANDLE h = createSCSIDeviceHandle (list [deviceIndex].scsiDriveLetter); - - if (h != INVALID_HANDLE_VALUE) - { - ScopedPointer cd (new AudioCDReader (new CDDeviceWrapper (list [deviceIndex], h))); - - if (cd->lengthInSamples > 0) - return cd.release(); - } - } - - return nullptr; -} - -AudioCDReader::AudioCDReader (void* handle_) - : AudioFormatReader (0, "CD Audio"), - handle (handle_), - indexingEnabled (false), - lastIndex (0), - firstFrameInBuffer (0), - samplesInBuffer (0) -{ - using namespace CDReaderHelpers; - jassert (handle_ != nullptr); - - refreshTrackLengths(); - - sampleRate = 44100.0; - bitsPerSample = 16; - numChannels = 2; - usesFloatingPointData = false; - - buffer.setSize (4 * bytesPerFrame, true); -} - -AudioCDReader::~AudioCDReader() -{ - using namespace CDReaderHelpers; - CDDeviceWrapper* const device = static_cast (handle); - delete device; -} - -bool AudioCDReader::readSamples (int** destSamples, int numDestChannels, int startOffsetInDestBuffer, - int64 startSampleInFile, int numSamples) -{ - using namespace CDReaderHelpers; - CDDeviceWrapper* const device = static_cast (handle); - - bool ok = true; - - while (numSamples > 0) - { - const int bufferStartSample = firstFrameInBuffer * samplesPerFrame; - const int bufferEndSample = bufferStartSample + samplesInBuffer; - - if (startSampleInFile >= bufferStartSample - && startSampleInFile < bufferEndSample) - { - const int toDo = (int) jmin ((int64) numSamples, bufferEndSample - startSampleInFile); - - int* const l = destSamples[0] + startOffsetInDestBuffer; - int* const r = numDestChannels > 1 ? (destSamples[1] + startOffsetInDestBuffer) : nullptr; - const short* src = (const short*) buffer.getData(); - src += 2 * (startSampleInFile - bufferStartSample); - - for (int i = 0; i < toDo; ++i) - { - l[i] = src [i << 1] << 16; - - if (r != nullptr) - r[i] = src [(i << 1) + 1] << 16; - } - - startOffsetInDestBuffer += toDo; - startSampleInFile += toDo; - numSamples -= toDo; - } - else - { - const int framesInBuffer = (int) (buffer.getSize() / bytesPerFrame); - const int frameNeeded = (int) (startSampleInFile / samplesPerFrame); - - if (firstFrameInBuffer + framesInBuffer != frameNeeded) - { - device->overlapBuffer.dataLength = 0; - device->overlapBuffer.startFrame = 0; - device->overlapBuffer.numFrames = 0; - device->jitter = false; - } - - firstFrameInBuffer = frameNeeded; - lastIndex = 0; - - CDReadBuffer readBuffer (framesInBuffer + 4); - readBuffer.wantsIndex = indexingEnabled; - - int i; - for (i = 5; --i >= 0;) - { - readBuffer.startFrame = frameNeeded; - readBuffer.numFrames = framesInBuffer; - - if (device->deviceHandle.readAudio (readBuffer, device->jitter ? &device->overlapBuffer : 0)) - break; - else - device->overlapBuffer.dataLength = 0; - } - - if (i >= 0) - { - buffer.copyFrom (readBuffer.buffer + readBuffer.dataStartOffset, 0, readBuffer.dataLength); - samplesInBuffer = readBuffer.dataLength >> 2; - lastIndex = readBuffer.index; - } - else - { - int* l = destSamples[0] + startOffsetInDestBuffer; - int* r = numDestChannels > 1 ? (destSamples[1] + startOffsetInDestBuffer) : nullptr; - - while (--numSamples >= 0) - { - *l++ = 0; - - if (r != nullptr) - *r++ = 0; - } - - // sometimes the read fails for just the very last couple of blocks, so - // we'll ignore and errors in the last half-second of the disk.. - ok = startSampleInFile > (trackStartSamples [getNumTracks()] - 20000); - break; - } - } - } - - return ok; -} - -bool AudioCDReader::isCDStillPresent() const -{ - using namespace CDReaderHelpers; - TOC toc = { 0 }; - return static_cast (handle)->deviceHandle.readTOC (&toc); -} - -void AudioCDReader::refreshTrackLengths() -{ - using namespace CDReaderHelpers; - trackStartSamples.clear(); - zeromem (audioTracks, sizeof (audioTracks)); - - TOC toc = { 0 }; - - if (static_cast (handle)->deviceHandle.readTOC (&toc)) - { - int numTracks = 1 + toc.lastTrack - toc.firstTrack; - - for (int i = 0; i <= numTracks; ++i) - { - trackStartSamples.add (samplesPerFrame * getAddressOfTrack (toc.tracks [i])); - audioTracks [i] = ((toc.tracks[i].ADR & 4) == 0); - } - } - - lengthInSamples = getPositionOfTrackStart (getNumTracks()); -} - -bool AudioCDReader::isTrackAudio (int trackNum) const -{ - return trackNum >= 0 && trackNum < getNumTracks() && audioTracks [trackNum]; -} - -void AudioCDReader::enableIndexScanning (bool b) -{ - indexingEnabled = b; -} - -int AudioCDReader::getLastIndex() const -{ - return lastIndex; -} - -int AudioCDReader::getIndexAt (int samplePos) -{ - using namespace CDReaderHelpers; - CDDeviceWrapper* const device = static_cast (handle); - - const int frameNeeded = samplePos / samplesPerFrame; - - device->overlapBuffer.dataLength = 0; - device->overlapBuffer.startFrame = 0; - device->overlapBuffer.numFrames = 0; - device->jitter = false; - - firstFrameInBuffer = 0; - lastIndex = 0; - - CDReadBuffer readBuffer (4 + framesPerIndexRead); - readBuffer.wantsIndex = true; - - int i; - for (i = 5; --i >= 0;) - { - readBuffer.startFrame = frameNeeded; - readBuffer.numFrames = framesPerIndexRead; - - if (device->deviceHandle.readAudio (readBuffer)) - break; - } - - if (i >= 0) - return readBuffer.index; - - return -1; -} - -Array AudioCDReader::findIndexesInTrack (const int trackNumber) -{ - using namespace CDReaderHelpers; - Array indexes; - - const int trackStart = getPositionOfTrackStart (trackNumber); - const int trackEnd = getPositionOfTrackStart (trackNumber + 1); - - bool needToScan = true; - - if (trackEnd - trackStart > 20 * 44100) - { - // check the end of the track for indexes before scanning the whole thing - needToScan = false; - int pos = jmax (trackStart, trackEnd - 44100 * 5); - bool seenAnIndex = false; - - while (pos <= trackEnd - samplesPerFrame) - { - const int index = getIndexAt (pos); - - if (index == 0) - { - // lead-out, so skip back a bit if we've not found any indexes yet.. - if (seenAnIndex) - break; - - pos -= 44100 * 5; - - if (pos < trackStart) - break; - } - else - { - if (index > 0) - seenAnIndex = true; - - if (index > 1) - { - needToScan = true; - break; - } - - pos += samplesPerFrame * framesPerIndexRead; - } - } - } - - if (needToScan) - { - CDDeviceWrapper* const device = static_cast (handle); - - int pos = trackStart; - int last = -1; - - while (pos < trackEnd - samplesPerFrame * 10) - { - const int frameNeeded = pos / samplesPerFrame; - - device->overlapBuffer.dataLength = 0; - device->overlapBuffer.startFrame = 0; - device->overlapBuffer.numFrames = 0; - device->jitter = false; - - firstFrameInBuffer = 0; - - CDReadBuffer readBuffer (4); - readBuffer.wantsIndex = true; - - int i; - for (i = 5; --i >= 0;) - { - readBuffer.startFrame = frameNeeded; - readBuffer.numFrames = framesPerIndexRead; - - if (device->deviceHandle.readAudio (readBuffer)) - break; - } - - if (i < 0) - break; - - if (readBuffer.index > last && readBuffer.index > 1) - { - last = readBuffer.index; - indexes.add (pos); - } - - pos += samplesPerFrame * framesPerIndexRead; - } - - indexes.removeFirstMatchingValue (trackStart); - } - - return indexes; -} - -void AudioCDReader::ejectDisk() -{ - using namespace CDReaderHelpers; - static_cast (handle)->deviceHandle.openDrawer (true); -} diff --git a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp index bc346fef..0cc4d1a1 100644 --- a/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp @@ -128,6 +128,7 @@ namespace FlacNamespace #define __STDC_LIMIT_MACROS 1 #define flac_max jmax #define flac_min jmin + #undef DEBUG // (some flac code dumps debug trace if the app defines this macro) #include "flac/all.h" #include "flac/libFLAC/bitmath.c" #include "flac/libFLAC/bitreader.c" @@ -386,7 +387,8 @@ class FlacWriter : public AudioFormatWriter { public: FlacWriter (OutputStream* const out, double rate, uint32 numChans, uint32 bits, int qualityOptionIndex) - : AudioFormatWriter (out, flacFormatName, rate, numChans, bits) + : AudioFormatWriter (out, flacFormatName, rate, numChans, bits), + streamStartPos (output != nullptr ? jmax (output->getPosition(), 0ll) : 0ll) { using namespace FlacNamespace; encoder = FLAC__stream_encoder_new(); @@ -494,7 +496,7 @@ public: packUint32 ((FLAC__uint32) info.total_samples, buffer + 14, 4); memcpy (buffer + 18, info.md5sum, 16); - const bool seekOk = output->setPosition (4); + const bool seekOk = output->setPosition (streamStartPos + 4); ignoreUnused (seekOk); // if this fails, you've given it an output stream that can't seek! It needs @@ -544,6 +546,7 @@ public: private: FlacNamespace::FLAC__StreamEncoder* encoder; + int64 streamStartPos; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FlacWriter) }; diff --git a/modules/juce_audio_formats/juce_audio_formats.h b/modules/juce_audio_formats/juce_audio_formats.h index 221ab2a5..b675a011 100644 --- a/modules/juce_audio_formats/juce_audio_formats.h +++ b/modules/juce_audio_formats/juce_audio_formats.h @@ -33,7 +33,7 @@ ID: juce_audio_formats vendor: juce - version: 4.2.4 + version: 4.3.0 name: JUCE audio file format codecs description: Classes for reading and writing various audio file formats. website: http://www.juce.com/juce diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Modifier_Injector.h b/modules/juce_audio_plugin_client/AAX/juce_AAX_Modifier_Injector.h index 9261ec72..9160de23 100644 --- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Modifier_Injector.h +++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Modifier_Injector.h @@ -34,8 +34,8 @@ struct ModifierKeyProvider struct ModifierKeyReceiver { virtual ~ModifierKeyReceiver() {} - virtual void setModifierKeyProvider (ModifierKeyProvider* provider) = 0; - virtual void removeModifierKeyProvider () = 0; + virtual void setModifierKeyProvider (ModifierKeyProvider*) = 0; + virtual void removeModifierKeyProvider() = 0; }; #endif diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp index d6722ae0..3e7263d7 100644 --- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp @@ -30,7 +30,6 @@ #include "../utility/juce_IncludeSystemHeaders.h" #include "../utility/juce_IncludeModuleHeaders.h" #include "../utility/juce_WindowsHooks.h" -#include "../utility/juce_PluginBusUtilities.h" #ifdef __clang__ #pragma clang diagnostic push @@ -102,7 +101,7 @@ const int32_t juceChunkType = 'juce'; const int maxAAXChannels = 8; //============================================================================== -struct AAXClasses +namespace AAXClasses { static int32 getAAXParamHash (AAX_CParamID paramID) noexcept { @@ -131,8 +130,40 @@ struct AAXClasses AudioChannelSet::ChannelType speakerOrder[8]; }; - static AAXChannelStreamOrder aaxChannelOrder[]; - static AAX_EStemFormat aaxFormats[AAX_eStemFormatNum]; + static AAXChannelStreamOrder aaxChannelOrder[] = + { + {AAX_eStemFormat_Mono, {AudioChannelSet::centre, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, + {AAX_eStemFormat_Stereo, {AudioChannelSet::left, AudioChannelSet::right, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, + {AAX_eStemFormat_LCR, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, + {AAX_eStemFormat_LCRS, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::centreSurround, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, + {AAX_eStemFormat_Quad, {AudioChannelSet::left, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, + {AAX_eStemFormat_5_0, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, + {AAX_eStemFormat_5_1, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::LFE, AudioChannelSet::unknown, AudioChannelSet::unknown}}, + {AAX_eStemFormat_6_0, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::centreSurround, AudioChannelSet::rightSurround, AudioChannelSet::unknown, AudioChannelSet::unknown}}, + {AAX_eStemFormat_6_1, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::centreSurround, AudioChannelSet::rightSurround, AudioChannelSet::LFE, AudioChannelSet::unknown}}, + {AAX_eStemFormat_7_0_SDDS, {AudioChannelSet::left, AudioChannelSet::leftCentre, AudioChannelSet::centre, AudioChannelSet::rightCentre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::unknown}}, + {AAX_eStemFormat_7_0_DTS, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftSurroundSide, AudioChannelSet::rightSurroundSide, AudioChannelSet::leftSurroundRear, AudioChannelSet::rightSurroundRear, AudioChannelSet::unknown}}, + {AAX_eStemFormat_7_1_SDDS, {AudioChannelSet::left, AudioChannelSet::leftCentre, AudioChannelSet::centre, AudioChannelSet::rightCentre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::LFE}}, + {AAX_eStemFormat_7_1_DTS, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftSurroundSide, AudioChannelSet::rightSurroundSide, AudioChannelSet::leftSurroundRear, AudioChannelSet::rightSurroundRear, AudioChannelSet::LFE}}, + {AAX_eStemFormat_None, {AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, + }; + + static AAX_EStemFormat aaxFormats[AAX_eStemFormatNum] = + { + AAX_eStemFormat_Mono, + AAX_eStemFormat_Stereo, + AAX_eStemFormat_LCR, + AAX_eStemFormat_LCRS, + AAX_eStemFormat_Quad, + AAX_eStemFormat_5_0, + AAX_eStemFormat_5_1, + AAX_eStemFormat_6_0, + AAX_eStemFormat_6_1, + AAX_eStemFormat_7_0_SDDS, + AAX_eStemFormat_7_1_SDDS, + AAX_eStemFormat_7_0_DTS, + AAX_eStemFormat_7_1_DTS + }; static AAX_EStemFormat getFormatForAudioChannelSet (const AudioChannelSet& set, bool ignoreLayout) noexcept { @@ -169,8 +200,8 @@ struct AAXClasses if (set == AudioChannelSet::create6point1()) return AAX_eStemFormat_6_1; if (set == AudioChannelSet::create7point0()) return AAX_eStemFormat_7_0_DTS; if (set == AudioChannelSet::create7point1()) return AAX_eStemFormat_7_1_DTS; - if (set == AudioChannelSet::createFront7point0()) return AAX_eStemFormat_7_0_SDDS; - if (set == AudioChannelSet::createFront7point1()) return AAX_eStemFormat_7_1_SDDS; + if (set == AudioChannelSet::create7point0SDDS()) return AAX_eStemFormat_7_0_SDDS; + if (set == AudioChannelSet::create7point1SDDS()) return AAX_eStemFormat_7_1_SDDS; return AAX_eStemFormat_INT32_MAX; } @@ -191,9 +222,9 @@ struct AAXClasses case AAX_eStemFormat_5_1: return AudioChannelSet::create5point1(); case AAX_eStemFormat_6_0: return AudioChannelSet::create6point0(); case AAX_eStemFormat_6_1: return AudioChannelSet::create6point1(); - case AAX_eStemFormat_7_0_SDDS: return AudioChannelSet::createFront7point0(); + case AAX_eStemFormat_7_0_SDDS: return AudioChannelSet::create7point0SDDS(); case AAX_eStemFormat_7_0_DTS: return AudioChannelSet::create7point0(); - case AAX_eStemFormat_7_1_SDDS: return AudioChannelSet::createFront7point1(); + case AAX_eStemFormat_7_1_SDDS: return AudioChannelSet::create7point1SDDS(); case AAX_eStemFormat_7_1_DTS: return AudioChannelSet::create7point1(); default: break; @@ -205,29 +236,6 @@ struct AAXClasses return AudioChannelSet::discreteChannels (jmax (0, static_cast (AAX_STEM_FORMAT_CHANNEL_COUNT (format)))); } - static const char* getSpeakerArrangementString (AAX_EStemFormat format) noexcept - { - switch (format) - { - case AAX_eStemFormat_Mono: return "M"; - case AAX_eStemFormat_Stereo: return "L R"; - case AAX_eStemFormat_LCR: return "L C R"; - case AAX_eStemFormat_LCRS: return "L C R S"; - case AAX_eStemFormat_Quad: return "L R Ls Rs"; - case AAX_eStemFormat_5_0: return "L C R Ls Rs"; - case AAX_eStemFormat_5_1: return "L C R Ls Rs LFE"; - case AAX_eStemFormat_6_0: return "L C R Ls Cs Rs"; - case AAX_eStemFormat_6_1: return "L C R Ls Cs Rs LFE"; - case AAX_eStemFormat_7_0_SDDS: return "L Lc C Rc R Ls Rs"; - case AAX_eStemFormat_7_1_SDDS: return "L Lc C Rc R Ls Rs LFE"; - case AAX_eStemFormat_7_0_DTS: return "L C R Lss Rss Lsr Rsr"; - case AAX_eStemFormat_7_1_DTS: return "L C R Lss Rss Lsr Rsr LFE"; - default: break; - } - - return nullptr; - } - static Colour getColourFromHighlightEnum (AAX_EHighlightColor colour) noexcept { switch (colour) @@ -331,6 +339,8 @@ struct AAXClasses #endif //============================================================================== + class JuceAAX_Processor; + class JuceAAX_GUI : public AAX_CEffectGUI, public ModifierKeyProvider { public: @@ -339,16 +349,7 @@ struct AAXClasses static AAX_IEffectGUI* AAX_CALLBACK Create() { return new JuceAAX_GUI(); } - void CreateViewContents() override - { - if (component == nullptr) - { - if (JuceAAX_Processor* params = dynamic_cast (GetEffectParameters())) - component = new ContentWrapperComponent (*this, params->getPluginInstance()); - else - jassertfalse; - } - } + void CreateViewContents() override; void CreateViewContainer() override { @@ -441,21 +442,8 @@ struct AAXClasses private: //============================================================================== - inline int getParamIndexFromID (AAX_CParamID paramID) const noexcept - { - if (const JuceAAX_Processor* params = dynamic_cast (GetEffectParameters())) - return params->getParamIndexFromID (paramID); - - return -1; - } - - inline AAX_CParamID getAAXParamIDFromJuceIndex (int index) const noexcept - { - if (const JuceAAX_Processor* params = dynamic_cast (GetEffectParameters())) - return params->getAAXParamIDFromJuceIndex (index); - - return nullptr; - } + int getParamIndexFromID (AAX_CParamID paramID) const noexcept; + AAX_CParamID getAAXParamIDFromJuceIndex (int index) const noexcept; //============================================================================== struct ContentWrapperComponent : public Component @@ -540,21 +528,23 @@ struct AAXClasses JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JuceAAX_GUI) }; + static void AAX_CALLBACK algorithmProcessCallback (JUCEAlgorithmContext* const instancesBegin[], const void* const instancesEnd); + //============================================================================== class JuceAAX_Processor : public AAX_CEffectParameters, public juce::AudioPlayHead, public AudioProcessorListener { public: - JuceAAX_Processor() : pluginInstance (createPluginFilterOfType (AudioProcessor::wrapperType_AAX)), - isPrepared (false), busUtils (*pluginInstance, false, maxAAXChannels), - sampleRate (0), lastBufferSize (1024), maxBufferSize (1024), - hasSidechain (false) + JuceAAX_Processor() + : pluginInstance (createPluginFilterOfType (AudioProcessor::wrapperType_AAX)), + isPrepared (false), + sampleRate (0), lastBufferSize (1024), maxBufferSize (1024) { pluginInstance->setPlayHead (this); pluginInstance->addListener (this); - busUtils.init(); + rebuildChannelMapArrays(); AAX_CEffectParameters::GetNumberOfChunks (&juceChunkIndex); } @@ -579,7 +569,6 @@ struct AAXClasses AAX_Result EffectInit() override { AAX_Result err; - check (Controller()->GetSampleRate (&sampleRate)); if ((err = preparePlugin()) != AAX_SUCCESS) @@ -641,7 +630,7 @@ struct AAXClasses juce::MemoryBlock& tempFilterData = getTemporaryChunkMemory(); if (tempFilterData.getSize() == 0) - return 20700 /*AAX_ERROR_PLUGIN_API_INVALID_THREAD*/; + return 20700; // AAX_ERROR_PLUGIN_API_INVALID_THREAD oChunk->fSize = (int32_t) tempFilterData.getSize(); tempFilterData.copyTo (oChunk->fData, 0, tempFilterData.getSize()); @@ -955,8 +944,8 @@ struct AAXClasses } else { - const int mainNumIns = numIns > 0 ? pluginInstance->busArrangement.inputBuses.getReference (0).channels.size() : 0; - const int sidechain = busUtils.getNumEnabledBuses (true) >= 2 ? sideChainBufferIdx : -1; + const int mainNumIns = pluginInstance->getMainBusNumInputChannels(); + const int sidechain = (pluginInstance->getChannelCountOfBus (true, 1) > 0 ? sideChainBufferIdx : -1); const int numChans = jmax (numIns, numOuts); if (numChans == 0) return; @@ -974,6 +963,9 @@ struct AAXClasses for (int i = 0; i < numIns; ++i) memcpy (channels[i], getAudioBufferForInput (inputs, sidechain, mainNumIns, i), (size_t) bufferSize * sizeof (float)); + for (int i = numIns; i < numOuts; ++i) + zeromem (channels[i], (size_t) bufferSize * sizeof (float)); + process (channels, numOuts, bufferSize, bypass, midiNodeIn, midiNodesOut); } else @@ -992,10 +984,168 @@ struct AAXClasses } } - bool supportsSidechain() const noexcept { return hasSidechain; }; + //============================================================================== + // In aax, the format of the aux and sidechain buses need to be fully determined + // by the format on the main buses. This function tried to provide such a mapping. + // Returns false if the in/out main layout is not supported + static bool fullBusesLayoutFromMainLayout (AudioProcessor& p, + const AudioChannelSet& mainInput, const AudioChannelSet& mainOutput, + AudioProcessor::BusesLayout& fullLayout) + { + bool success = p.setBusesLayout (getDefaultLayout (p, true)); + jassert (success); + ignoreUnused (success); + + const int numInputBuses = p.getBusCount (true); + const int numOutputBuses = p.getBusCount (false); + + if (AudioProcessor::Bus* bus = p.getBus (true, 0)) + if (! bus->setCurrentLayout (mainInput)) + return false; + + if (AudioProcessor::Bus* bus = p.getBus (false, 0)) + if (! bus->setCurrentLayout (mainOutput)) + return false; + + // did this change the input again + if (numInputBuses > 0 && p.getChannelLayoutOfBus (true, 0) != mainInput) + return false; + + #ifdef JucePlugin_PreferredChannelConfigurations + short configs[][2] = {JucePlugin_PreferredChannelConfigurations}; + if (! AudioProcessor::containsLayout (p.getBusesLayout(), configs)) + return false; + #endif + + bool foundValid = false; + { + AudioProcessor::BusesLayout onlyMains = p.getBusesLayout(); + + for (int i = 1; i < numInputBuses; ++i) + onlyMains.inputBuses.getReference (i) = AudioChannelSet::disabled(); + + for (int i = 1; i < numOutputBuses; ++i) + onlyMains.outputBuses.getReference (i) = AudioChannelSet::disabled(); + + if (p.checkBusesLayoutSupported (onlyMains)) + { + foundValid = true; + fullLayout = onlyMains; + } + } + + if (numInputBuses > 1) + { + // can the first bus be a sidechain or disabled, if not then we can't use this layout combination + if (AudioProcessor::Bus* bus = p.getBus (true, 1)) + if (! bus->setCurrentLayout (AudioChannelSet::mono()) && ! bus->setCurrentLayout (AudioChannelSet::disabled())) + return foundValid; + + // can all the other inputs be disabled, if not then we can't use this layout combination + for (int i = 2; i < numInputBuses; ++i) + if (AudioProcessor::Bus* bus = p.getBus (true, i)) + if (! bus->setCurrentLayout (AudioChannelSet::disabled())) + return foundValid; + + if (AudioProcessor::Bus* bus = p.getBus (true, 0)) + if (! bus->setCurrentLayout (mainInput)) + return foundValid; + + if (AudioProcessor::Bus* bus = p.getBus (false, 0)) + if (! bus->setCurrentLayout (mainOutput)) + return foundValid; + + // recheck if the format is correct + if ((numInputBuses > 0 && p.getChannelLayoutOfBus (true, 0) != mainInput) + || (numOutputBuses > 0 && p.getChannelLayoutOfBus (false, 0) != mainOutput)) + return foundValid; + + const AudioChannelSet& sidechainBus = p.getChannelLayoutOfBus (true, 1); + if (sidechainBus != AudioChannelSet::mono() && sidechainBus != AudioChannelSet::disabled()) + return foundValid; + + for (int i = 2; i < numInputBuses; ++i) + if (p.getChannelLayoutOfBus (true, i) != AudioChannelSet::disabled()) + return foundValid; + } + + const bool hasSidechain = (numInputBuses > 1 && p.getChannelLayoutOfBus (true, 1) == AudioChannelSet::mono()); + + if (hasSidechain) + { + AudioProcessor::BusesLayout onlyMainsAndSidechain = p.getBusesLayout(); + + for (int i = 1; i < numOutputBuses; ++i) + onlyMainsAndSidechain.outputBuses.getReference (i) = AudioChannelSet::disabled(); + + if (p.checkBusesLayoutSupported (onlyMainsAndSidechain)) + { + foundValid = true; + fullLayout = onlyMainsAndSidechain; + } + } + + if (numOutputBuses > 1) + { + AudioProcessor::BusesLayout copy = p.getBusesLayout(); + + int maxAuxBuses = jmin (16, numOutputBuses); + for (int i = 1; i < maxAuxBuses; ++i) + copy.outputBuses.getReference (i) = mainOutput; + + for (int i = maxAuxBuses; i < numOutputBuses; ++i) + copy.outputBuses.getReference (i) = AudioChannelSet::disabled(); + + if (p.checkBusesLayoutSupported (copy)) + { + fullLayout = copy; + foundValid = true; + } + else + { + for (int i = 1; i < maxAuxBuses; ++i) + if (p.getChannelLayoutOfBus (false, i).isDisabled()) + return foundValid; + + for (int i = maxAuxBuses; i < numOutputBuses; ++i) + if (AudioProcessor::Bus* bus = p.getBus (false, i)) + if (! bus->setCurrentLayout (AudioChannelSet::disabled())) + return foundValid; + + if (AudioProcessor::Bus* bus = p.getBus (true, 0)) + if (! bus->setCurrentLayout (mainInput)) + return foundValid; + + if (AudioProcessor::Bus* bus = p.getBus (false, 0)) + if (! bus->setCurrentLayout (mainOutput)) + return foundValid; + + if ((numInputBuses > 0 && p.getChannelLayoutOfBus (true, 0) != mainInput) + || (numOutputBuses > 0 && p.getChannelLayoutOfBus (false, 0) != mainOutput)) + return foundValid; + + if (numInputBuses > 1 ) + { + const AudioChannelSet& sidechainBus = p.getChannelLayoutOfBus (true, 1); + if (sidechainBus != AudioChannelSet::mono() && sidechainBus != AudioChannelSet::disabled()) + return foundValid; + } + + for (int i = maxAuxBuses; i < numOutputBuses; ++i) + if (! p.getChannelLayoutOfBus (false, i).isDisabled()) + return foundValid; + + fullLayout = p.getBusesLayout(); + foundValid = true; + } + } + + return foundValid; + } private: friend class JuceAAX_GUI; + friend void AAX_CALLBACK AAXClasses::algorithmProcessCallback (JUCEAlgorithmContext* const instancesBegin[], const void* const instancesEnd); void process (float* const* channels, const int numChans, const int bufferSize, const bool bypass, AAX_IMIDINode* midiNodeIn, AAX_IMIDINode* midiNodesOut) @@ -1037,7 +1187,7 @@ struct AAXClasses // value during initialisation. pluginInstance->prepareToPlay (sampleRate, bufferSize); maxBufferSize = bufferSize; - sideChainBuffer.realloc (static_cast (maxBufferSize)); + sideChainBuffer.calloc (static_cast (maxBufferSize)); } } @@ -1136,15 +1286,22 @@ struct AAXClasses } } - AAX_Result preparePlugin() + bool getMainBusFormats (AudioChannelSet& inputSet, AudioChannelSet& outputSet) { AudioProcessor& audioProcessor = getPluginInstance(); - bool hasSomethingChanged = false; + #if ! JucePlugin_IsMidiEffect + const int inputBuses = audioProcessor.getBusCount (true); + const int outputBuses = audioProcessor.getBusCount (false); + #endif #if JucePlugin_IsMidiEffect // MIDI effect plug-ins do not support any audio channels - jassert (audioProcessor.busArrangement.getTotalNumInputChannels() == 0 - && audioProcessor.busArrangement.getTotalNumOutputChannels() == 0); + jassert (audioProcessor.getTotalNumInputChannels() == 0 + && audioProcessor.getTotalNumOutputChannels() == 0); + + inputSet = outputSet = AudioChannelSet(); + + return true; #else AAX_EStemFormat inputStemFormat = AAX_eStemFormat_None; check (Controller()->GetInputStemFormat (&inputStemFormat)); @@ -1152,11 +1309,30 @@ struct AAXClasses AAX_EStemFormat outputStemFormat = AAX_eStemFormat_None; check (Controller()->GetOutputStemFormat (&outputStemFormat)); - const AudioChannelSet inputSet = channelSetFromStemFormat (inputStemFormat, busUtils.busIgnoresLayout (true, 0)); - const AudioChannelSet outputSet = channelSetFromStemFormat (outputStemFormat, busUtils.busIgnoresLayout (false, 0)); + #if JucePlugin_IsSynth + if (inputBuses == 0) inputStemFormat = AAX_eStemFormat_None; + #endif + + inputSet = (inputBuses > 0 ? channelSetFromStemFormat (inputStemFormat, false) : AudioChannelSet()); + outputSet = (outputBuses > 0 ? channelSetFromStemFormat (outputStemFormat, false) : AudioChannelSet()); if ( (inputSet == AudioChannelSet::disabled() && inputStemFormat != AAX_eStemFormat_None) - || (outputSet == AudioChannelSet::disabled() && outputStemFormat != AAX_eStemFormat_None)) + || (outputSet == AudioChannelSet::disabled() && outputStemFormat != AAX_eStemFormat_None) + || (inputSet != AudioChannelSet::disabled() && inputBuses == 0) + || (outputSet != AudioChannelSet::disabled() && outputBuses == 0)) + return false; + + return true; + #endif + } + + AAX_Result preparePlugin() + { + AudioProcessor& audioProcessor = getPluginInstance(); + AudioProcessor::BusesLayout oldLayout = audioProcessor.getBusesLayout(); + + AudioChannelSet inputSet, outputSet; + if (! getMainBusFormats (inputSet, outputSet)) { if (isPrepared) { @@ -1167,26 +1343,8 @@ struct AAXClasses return AAX_ERROR_UNIMPLEMENTED; } - - bool success = true; - - if (busUtils.getBusCount (true) > 0) - success = setPreferredBusArrangement (busUtils, true, 0, inputSet, hasSomethingChanged); - - if (success && busUtils.getBusCount (false) > 0) - success = setPreferredBusArrangement (busUtils, false, 0, outputSet, hasSomethingChanged); - - // This should never happen as the plugin reported that this layout is supported - jassert (success); - - hasSidechain = enableAuxBusesForCurrentFormat (busUtils, inputSet, outputSet, hasSomethingChanged); - if (hasSidechain && hasSomethingChanged) - sideChainBuffer.realloc (static_cast (maxBufferSize)); - - // recheck the format - if ( (busUtils.getBusCount (true) > 0 && busUtils.getChannelSet (true, 0) != inputSet) - || (busUtils.getBusCount (false) > 0 && busUtils.getChannelSet (false, 0) != outputSet) - || (hasSidechain && busUtils.getNumChannels(true, 1) != 1)) + AudioProcessor::BusesLayout newLayout; + if (! fullBusesLayoutFromMainLayout (audioProcessor, inputSet, outputSet, newLayout)) { if (isPrepared) { @@ -1197,18 +1355,25 @@ struct AAXClasses return AAX_ERROR_UNIMPLEMENTED; } - if (hasSomethingChanged) + const bool layoutChanged = (oldLayout != newLayout); + + if (layoutChanged) { - rebuildChannelMapArrays (true); - rebuildChannelMapArrays (false); - } - #endif + if (! audioProcessor.setBusesLayout (newLayout)) + { + if (isPrepared) + { + isPrepared = false; + audioProcessor.releaseResources(); + } - hasSomethingChanged = (sampleRate != audioProcessor.getSampleRate() - || maxBufferSize != lastBufferSize - || hasSomethingChanged); + return AAX_ERROR_UNIMPLEMENTED; + } - if (hasSomethingChanged || (! isPrepared)) + rebuildChannelMapArrays(); + } + + if (layoutChanged || (! isPrepared)) { if (isPrepared) { @@ -1219,6 +1384,10 @@ struct AAXClasses audioProcessor.setRateAndBufferSizeDetails (sampleRate, lastBufferSize); audioProcessor.prepareToPlay (sampleRate, lastBufferSize); maxBufferSize = lastBufferSize; + hasSidechain = audioProcessor.getChannelLayoutOfBus (true, 1) == AudioChannelSet::mono(); + + if (hasSidechain) + sideChainBuffer.calloc (static_cast (maxBufferSize)); } check (Controller()->SetSignalLatency (audioProcessor.getLatencySamples())); @@ -1228,30 +1397,56 @@ struct AAXClasses return AAX_SUCCESS; } - void rebuildChannelMapArrays (bool isInput) + void rebuildChannelMapArrays() { - Array& layoutMap = isInput ? inputLayoutMap : outputLayoutMap; - layoutMap.clear(); - - const int n = isInput ? jmin (busUtils.getBusCount (true), 1) : busUtils.getBusCount (false); + AudioProcessor& audioProcessor = getPluginInstance(); - int chOffset = 0; - for (int busIdx = 0; busIdx < n; ++busIdx) + for (int dir = 0; dir < 2; ++dir) { - const AudioChannelSet channelFormat = busUtils.getChannelSet (isInput, busIdx); + const bool isInput = (dir == 0); + Array& layoutMap = isInput ? inputLayoutMap : outputLayoutMap; + layoutMap.clear(); + + const int n = audioProcessor.getBusCount (isInput); - if (channelFormat != AudioChannelSet::disabled()) + int chOffset = 0; + for (int busIdx = 0; busIdx < n; ++busIdx) { - const int numChannels = channelFormat.size(); + const AudioChannelSet channelFormat = audioProcessor.getChannelLayoutOfBus (isInput, busIdx); + + if (channelFormat != AudioChannelSet::disabled()) + { + const int numChannels = channelFormat.size(); - for (int ch = 0; ch < numChannels; ++ch) - layoutMap.add (juceChannelIndexToAax (ch, channelFormat) + chOffset); + for (int ch = 0; ch < numChannels; ++ch) + layoutMap.add (juceChannelIndexToAax (ch, channelFormat) + chOffset); - chOffset += numChannels; + chOffset += numChannels; + } } } } + static void algorithmCallback (JUCEAlgorithmContext* const instancesBegin[], const void* const instancesEnd) + { + + for (JUCEAlgorithmContext* const* iter = instancesBegin; iter < instancesEnd; ++iter) + { + const JUCEAlgorithmContext& i = **iter; + + int sideChainBufferIdx = i.pluginInstance->parameters.hasSidechain && i.sideChainBuffers != nullptr + ? static_cast (*i.sideChainBuffers) : -1; + + // sidechain index of zero is an invalid index + if (sideChainBufferIdx <= 0) + sideChainBufferIdx = -1; + + i.pluginInstance->parameters.process (i.inputChannels, i.outputChannels, sideChainBufferIdx, + *(i.bufferSize), *(i.bypass) != 0, + getMidiNodeIn(i), getMidiNodeOut(i)); + } + } + //============================================================================== inline int getParamIndexFromID (AAX_CParamID paramID) const noexcept { @@ -1265,12 +1460,45 @@ struct AAXClasses return aaxParamIDs.getReference (index).getCharPointer(); } + //============================================================================== + static AudioProcessor::BusesLayout getDefaultLayout (AudioProcessor& p, bool enableAll) + { + AudioProcessor::BusesLayout defaultLayout; + + for (int dir = 0; dir < 2; ++dir) + { + const bool isInput = (dir == 0); + const int n = p.getBusCount (isInput); + Array& layouts = (isInput ? defaultLayout.inputBuses : defaultLayout.outputBuses); + + for (int i = 0; i < n; ++i) + if (AudioProcessor::Bus* bus = p.getBus (isInput, i)) + layouts.add (enableAll || bus->isEnabledByDefault() ? bus->getDefaultLayout() : AudioChannelSet()); + } + + return defaultLayout; + } + + static AudioProcessor::BusesLayout getDefaultLayout (AudioProcessor& p) + { + AudioProcessor::BusesLayout defaultLayout; + + defaultLayout = getDefaultLayout (p, true); + + if (! p.checkBusesLayoutSupported (defaultLayout)) + defaultLayout = getDefaultLayout (p, false); + + // Your processor must support the default layout + jassert (p.checkBusesLayoutSupported (defaultLayout)); + return defaultLayout; + } + //============================================================================== ScopedJuceInitialiser_GUI libraryInitialiser; ScopedPointer pluginInstance; + bool isPrepared; - PluginBusUtilities busUtils; MidiBuffer midiBuffer; Array channelList; int32_t juceChunkIndex; @@ -1302,6 +1530,34 @@ struct AAXClasses JUCE_DECLARE_NON_COPYABLE (JuceAAX_Processor) }; + //============================================================================== + void JuceAAX_GUI::CreateViewContents() + { + if (component == nullptr) + { + if (JuceAAX_Processor* params = dynamic_cast (GetEffectParameters())) + component = new ContentWrapperComponent (*this, params->getPluginInstance()); + else + jassertfalse; + } + } + + int JuceAAX_GUI::getParamIndexFromID (AAX_CParamID paramID) const noexcept + { + if (const JuceAAX_Processor* params = dynamic_cast (GetEffectParameters())) + return params->getParamIndexFromID (paramID); + + return -1; + } + + AAX_CParamID JuceAAX_GUI::getAAXParamIDFromJuceIndex (int index) const noexcept + { + if (const JuceAAX_Processor* params = dynamic_cast (GetEffectParameters())) + return params->getAAXParamIDFromJuceIndex (index); + + return nullptr; + } + //============================================================================== struct AAXFormatConfiguration { @@ -1322,138 +1578,20 @@ struct AAXClasses }; //============================================================================== - static void AAX_CALLBACK algorithmProcessCallback (JUCEAlgorithmContext* const instancesBegin[], - const void* const instancesEnd) - { - for (JUCEAlgorithmContext* const* iter = instancesBegin; iter < instancesEnd; ++iter) - { - const JUCEAlgorithmContext& i = **iter; - - int sideChainBufferIdx = i.pluginInstance->parameters.supportsSidechain() && i.sideChainBuffers != nullptr - ? static_cast (*i.sideChainBuffers) - : -1; - - // sidechain index of zero is an invalid index - if (sideChainBufferIdx <= 0) - sideChainBufferIdx = -1; - - i.pluginInstance->parameters.process (i.inputChannels, i.outputChannels, sideChainBufferIdx, - *(i.bufferSize), *(i.bypass) != 0, - getMidiNodeIn(i), getMidiNodeOut(i)); - } - } - - static bool enableAuxBusesForCurrentFormat (PluginBusUtilities& busUtils, const AudioChannelSet& inputLayout, - const AudioChannelSet& outputLayout, - bool& hasSomethingChanged) + static void createDescriptor (AAX_IComponentDescriptor& desc, int configIndex, const AudioProcessor::BusesLayout& fullLayout, AudioProcessor& processor) { - const int numOutBuses = busUtils.getBusCount (false); - const int numInputBuses = busUtils.getBusCount(true); - - if (numOutBuses > 1) - { - PluginBusUtilities::ScopedBusRestorer layoutRestorer (busUtils); - - // enable all possible output buses - for (int busIdx = 1; busIdx < busUtils.getBusCount (false); ++busIdx) - { - AudioChannelSet layout = busUtils.getChannelSet (false, busIdx); - - // bus disabled by default? try to enable it with the default layout - if (layout == AudioChannelSet::disabled()) - { - layout = busUtils.getDefaultLayoutForBus (false, busIdx); - setPreferredBusArrangement (busUtils, false, busIdx, layout, hasSomethingChanged); - } - } - - // changing output buses may have changed main bus layout - bool success = true; - - if (numInputBuses > 0) - success = setPreferredBusArrangement (busUtils, true, 0, inputLayout, hasSomethingChanged); - - if (success) - success = setPreferredBusArrangement (busUtils, false, 0, outputLayout, hasSomethingChanged); - - // was the above successful - if (success && (numInputBuses == 0 || busUtils.getChannelSet (true, 0) == inputLayout) - && busUtils.getChannelSet (false, 0) == outputLayout) - layoutRestorer.release(); - else - hasSomethingChanged = true; - } - - // does the plug-in have side-chain support? Check the following: - // 1) does it have an input bus with index = 1 which supports mono - // 2) can all other input buses be disabled - // 3) does the format of the main buses not change when enabling the first bus - if (numInputBuses > 1) - { - bool success = true; - bool hasSidechain = false; - - const AudioChannelSet set = busUtils.getDefaultLayoutForChannelNumAndBus (true, 1, 1); - if (! set.isDisabled()) - hasSidechain = setPreferredBusArrangement (busUtils, true, 1, set, hasSomethingChanged); - - if (! hasSidechain) - success = setPreferredBusArrangement (busUtils, true, 1, - AudioChannelSet::disabled(), - hasSomethingChanged); - - // AAX requires your processor's first sidechain to be either mono or that - // it can be disabled - jassert(success); - - // disable all other input buses - for (int busIdx = 2; busIdx < numInputBuses; ++busIdx) - { - success = setPreferredBusArrangement (busUtils, true, busIdx, - AudioChannelSet::disabled(), - hasSomethingChanged); - - // AAX can only have a single side-chain input. Therefore, your processor must either - // only have a single side-chain input or allow disabling all other side-chains - jassert (success); - } - - if (hasSidechain) - { - if (busUtils.getBusCount (false) == 0 || busUtils.getBusCount (true) == 0 || - (busUtils.getChannelSet (true, 0) == inputLayout && busUtils.getChannelSet (false, 0) == outputLayout)) - return true; - - // restore the old layout - if (busUtils.getBusCount(true) > 0) - setPreferredBusArrangement (busUtils, true, 0, inputLayout, hasSomethingChanged); - - if (busUtils.getBusCount (false) > 0) - setPreferredBusArrangement (busUtils, false, 0, outputLayout, hasSomethingChanged); - } - } - - return false; - } + AAX_EStemFormat aaxInputFormat = getFormatForAudioChannelSet (fullLayout.getMainInputChannelSet(), false); + AAX_EStemFormat aaxOutputFormat = getFormatForAudioChannelSet (fullLayout.getMainOutputChannelSet(), false); - // wrap setPreferredBusArrangement calls with this to prevent excessive calls to the plug-in - static bool setPreferredBusArrangement (PluginBusUtilities& busUtils, bool isInput, int busIdx, - const AudioChannelSet& layout, - bool& didChangePlugin) - { - // no need to do anything - if (busUtils.getChannelSet (isInput, busIdx) == layout) - return true; + #if JucePlugin_IsSynth + if (aaxInputFormat == AAX_eStemFormat_None) + aaxInputFormat = aaxOutputFormat; + #endif - didChangePlugin = true; - return busUtils.processor.setPreferredBusArrangement (isInput, busIdx, layout); - } + #if JucePlugin_IsMidiEffect + aaxInputFormat = aaxOutputFormat = AAX_eStemFormat_Mono; + #endif - //============================================================================== - static void createDescriptor (AAX_IComponentDescriptor& desc, int configIndex, PluginBusUtilities& busUtils, - const AudioChannelSet& inputLayout, const AudioChannelSet& outputLayout, - const AAX_EStemFormat aaxInputFormat, const AAX_EStemFormat aaxOutputFormat) - { check (desc.AddAudioIn (JUCEAlgorithmIDs::inputChannels)); check (desc.AddAudioOut (JUCEAlgorithmIDs::outputChannels)); @@ -1511,53 +1649,42 @@ struct AAXClasses properties->AddProperty (AAX_eProperty_SupportsSaveRestore, false); #endif - bool ignore; - if (enableAuxBusesForCurrentFormat (busUtils, inputLayout, outputLayout, ignore)) + if (fullLayout.getChannelSet (true, 1) == AudioChannelSet::mono()) { check (desc.AddSideChainIn (JUCEAlgorithmIDs::sideChainBuffers)); properties->AddProperty (AAX_eProperty_SupportsSideChainInput, true); } + const int maxAuxBuses = jmax (0, jmin (15, fullLayout.outputBuses.size() - 1)); + + // add the output buses // This is incrdibly dumb: the output bus format must be well defined // for every main bus in/out format pair. This means that there cannot // be two configurations with different aux formats but // identical main bus in/out formats. - for (int busIdx = 1; busIdx < busUtils.getBusCount (false); ++busIdx) + for (int busIdx = 1; busIdx < maxAuxBuses + 1; ++busIdx) { - AudioChannelSet outBusLayout = busUtils.getChannelSet (false, busIdx); + const AudioChannelSet& set = fullLayout.getChannelSet (false, busIdx); + if (set.isDisabled()) break; - if (outBusLayout != AudioChannelSet::disabled()) + AAX_EStemFormat auxFormat = getFormatForAudioChannelSet (set, true); + if (auxFormat != AAX_eStemFormat_INT32_MAX && auxFormat != AAX_eStemFormat_None) { - AAX_EStemFormat auxFormat = getFormatForAudioChannelSet (outBusLayout, busUtils.busIgnoresLayout (false, busIdx)); - if (auxFormat != AAX_eStemFormat_INT32_MAX && auxFormat != AAX_eStemFormat_None) - { - const String& name = busUtils.processor.busArrangement.outputBuses.getReference (busIdx).name; - check (desc.AddAuxOutputStem (0, static_cast (auxFormat), name.toRawUTF8())); - } + const String& name = processor.getBus (false, busIdx)->getName(); + check (desc.AddAuxOutputStem (0, static_cast (auxFormat), name.toRawUTF8())); } } - // this assertion should be covered by the assertions above - // if not please report a bug - jassert (busUtils.getNumEnabledBuses (true) <= 2); - check (desc.AddProcessProc_Native (algorithmProcessCallback, properties)); } static void getPlugInDescription (AAX_IEffectDescriptor& descriptor) { PluginHostType::jucePlugInClientCurrentWrapperType = AudioProcessor::wrapperType_AAX; - ScopedPointer plugin = createPluginFilterOfType (AudioProcessor::wrapperType_AAX); - PluginBusUtilities busUtils (*plugin, false, maxAAXChannels); - - busUtils.init(); - - // AAX requires your default layout to be non-discrete! - // For example, your default layout must be mono, stereo, quadrophonic - // and not AudioChannelSet::discreteChannels (2) etc. - jassert (busUtils.checkBusFormatsAreNotDiscrete()); + const int numInputBuses = plugin->getBusCount (true); + const int numOutputBuses = plugin->getBusCount (false); descriptor.AddName (JucePlugin_Desc); descriptor.AddName (JucePlugin_Name); @@ -1574,21 +1701,19 @@ struct AAXClasses #if JucePlugin_IsMidiEffect // MIDI effect plug-ins do not support any audio channels - jassert (busUtils.getBusCount (true) == 0 && busUtils.getBusCount (false) == 0); + jassert (numInputBuses == 0 && numOutputBuses == 0); if (AAX_IComponentDescriptor* const desc = descriptor.NewComponentDescriptor()) { - createDescriptor (*desc, 0, busUtils, - AudioChannelSet::disabled(), AudioChannelSet::disabled(), - AAX_eStemFormat_Mono, AAX_eStemFormat_Mono); + createDescriptor (*desc, 0, plugin->getBusesLayout(), *plugin); check (descriptor.AddComponent (desc)); } #else int configIndex = 0; - const int numIns = busUtils.getBusCount (true) > 0 ? AAX_eStemFormatNum : 0; - const int numOuts = busUtils.getBusCount (false) > 0 ? AAX_eStemFormatNum : 0; + const int numIns = numInputBuses > 0 ? AAX_eStemFormatNum : 0; + const int numOuts = numOutputBuses > 0 ? AAX_eStemFormatNum : 0; for (int inIdx = 0; inIdx < jmax (numIns, 1); ++inIdx) { @@ -1600,33 +1725,13 @@ struct AAXClasses AAX_EStemFormat aaxOutFormat = numOuts > 0 ? aaxFormats[outIdx] : AAX_eStemFormat_None; AudioChannelSet outLayout = channelSetFromStemFormat (aaxOutFormat, false); - bool success = true; - - if (numIns > 0) - success = busUtils.processor.setPreferredBusArrangement (true, 0, inLayout); - - if (numOuts > 0 && success) - success = busUtils.processor.setPreferredBusArrangement (false, 0, outLayout); - - if (! success) - continue; - - // if we can't set both in AND out formats simultaneously then ignore this format! - if (numIns > 0 && numOuts > 0 && (inLayout != busUtils.getChannelSet (true, 0) || (outLayout != busUtils.getChannelSet (false, 0)))) - continue; - - // AAX requires a single input if this plug-in is a synth - #if JucePlugin_IsSynth - if (numIns == 0) - aaxInFormat = aaxOutFormat; - #endif - - if (aaxInFormat == AAX_eStemFormat_None && aaxOutFormat == AAX_eStemFormat_None) + AudioProcessor::BusesLayout fullLayout; + if (! JuceAAX_Processor::fullBusesLayoutFromMainLayout (*plugin, inLayout, outLayout, fullLayout)) continue; if (AAX_IComponentDescriptor* const desc = descriptor.NewComponentDescriptor()) { - createDescriptor (*desc, configIndex++, busUtils, inLayout, outLayout, aaxInFormat, aaxOutFormat); + createDescriptor (*desc, configIndex++, fullLayout, *plugin); check (descriptor.AddComponent (desc)); } } @@ -1636,43 +1741,12 @@ struct AAXClasses jassert (configIndex > 0); #endif } -}; +} -//============================================================================== -AAX_EStemFormat AAXClasses::aaxFormats[] = -{ - AAX_eStemFormat_Mono, - AAX_eStemFormat_Stereo, - AAX_eStemFormat_LCR, - AAX_eStemFormat_LCRS, - AAX_eStemFormat_Quad, - AAX_eStemFormat_5_0, - AAX_eStemFormat_5_1, - AAX_eStemFormat_6_0, - AAX_eStemFormat_6_1, - AAX_eStemFormat_7_0_SDDS, - AAX_eStemFormat_7_1_SDDS, - AAX_eStemFormat_7_0_DTS, - AAX_eStemFormat_7_1_DTS -}; - -AAXClasses::AAXChannelStreamOrder AAXClasses::aaxChannelOrder[] = +void AAX_CALLBACK AAXClasses::algorithmProcessCallback (JUCEAlgorithmContext* const instancesBegin[], const void* const instancesEnd) { - {AAX_eStemFormat_Mono, {AudioChannelSet::centre, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, - {AAX_eStemFormat_Stereo, {AudioChannelSet::left, AudioChannelSet::right, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, - {AAX_eStemFormat_LCR, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, - {AAX_eStemFormat_LCRS, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::surround, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, - {AAX_eStemFormat_Quad, {AudioChannelSet::left, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, - {AAX_eStemFormat_5_0, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, - {AAX_eStemFormat_5_1, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::subbass, AudioChannelSet::unknown, AudioChannelSet::unknown}}, - {AAX_eStemFormat_6_0, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::surround, AudioChannelSet::rightSurround, AudioChannelSet::unknown, AudioChannelSet::unknown}}, - {AAX_eStemFormat_6_1, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::surround, AudioChannelSet::rightSurround, AudioChannelSet::subbass, AudioChannelSet::unknown}}, - {AAX_eStemFormat_7_0_SDDS, {AudioChannelSet::left, AudioChannelSet::leftCentre, AudioChannelSet::centre, AudioChannelSet::rightCentre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::unknown}}, - {AAX_eStemFormat_7_0_DTS, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftRearSurround, AudioChannelSet::rightRearSurround, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::unknown}}, - {AAX_eStemFormat_7_1_SDDS, {AudioChannelSet::left, AudioChannelSet::leftCentre, AudioChannelSet::centre, AudioChannelSet::rightCentre, AudioChannelSet::right, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::subbass}}, - {AAX_eStemFormat_7_1_DTS, {AudioChannelSet::left, AudioChannelSet::centre, AudioChannelSet::right, AudioChannelSet::leftRearSurround, AudioChannelSet::rightRearSurround, AudioChannelSet::leftSurround, AudioChannelSet::rightSurround, AudioChannelSet::subbass}}, - {AAX_eStemFormat_None, {AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown, AudioChannelSet::unknown}}, -}; + AAXClasses::JuceAAX_Processor::algorithmCallback (instancesBegin, instancesEnd); +} //============================================================================== AAX_Result JUCE_CDECL GetEffectDescriptions (AAX_ICollection*); diff --git a/modules/juce_audio_plugin_client/AUResources.r b/modules/juce_audio_plugin_client/AUResources.r new file mode 100644 index 00000000..55040fc3 --- /dev/null +++ b/modules/juce_audio_plugin_client/AUResources.r @@ -0,0 +1,140 @@ +/* + File: AUResources.r + Abstract: AUResources.r + Version: 1.1 + + Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple + Inc. ("Apple") in consideration of your agreement to the following + terms, and your use, installation, modification or redistribution of + this Apple software constitutes acceptance of these terms. If you do + not agree with these terms, please do not use, install, modify or + redistribute this Apple software. + + In consideration of your agreement to abide by the following terms, and + subject to these terms, Apple grants you a personal, non-exclusive + license, under Apple's copyrights in this original Apple software (the + "Apple Software"), to use, reproduce, modify and redistribute the Apple + Software, with or without modifications, in source and/or binary forms; + provided that if you redistribute the Apple Software in its entirety and + without modifications, you must retain this notice and the following + text and disclaimers in all such redistributions of the Apple Software. + Neither the name, trademarks, service marks or logos of Apple Inc. may + be used to endorse or promote products derived from the Apple Software + without specific prior written permission from Apple. Except as + expressly stated in this notice, no other rights or licenses, express or + implied, are granted by Apple herein, including but not limited to any + patent rights that may be infringed by your derivative works or by other + works in which the Apple Software may be incorporated. + + The Apple Software is provided by Apple on an "AS IS" basis. APPLE + MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION + THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND + OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS. + + IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, + MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED + AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), + STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + Copyright (C) 2014 Apple Inc. All Rights Reserved. + +*/ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// AUResources.r +// +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ + +/* sample macro definitions -- all of these symbols must be defined +#define RES_ID kHALOutputResID +#define COMP_TYPE kAudioUnitComponentType +#define COMP_SUBTYPE kAudioUnitOutputSubType +#define COMP_MANUF kAudioUnitAudioHardwareOutputSubSubType +#define VERSION 0x00010000 +#define NAME "AudioHALOutput" +#define DESCRIPTION "Audio hardware output AudioUnit" +#define ENTRY_POINT "AUHALEntry" +*/ +#define UseExtendedThingResource 1 + +#include + +// this is a define used to indicate that a component has no static data that would mean +// that no more than one instance could be open at a time - never been true for AUs +#ifndef cmpThreadSafeOnMac +#define cmpThreadSafeOnMac 0x10000000 +#endif + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +resource 'STR ' (RES_ID, purgeable) { + NAME +}; + +resource 'STR ' (RES_ID + 1, purgeable) { + DESCRIPTION +}; + +resource 'dlle' (RES_ID) { + ENTRY_POINT +}; + +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +resource 'thng' (RES_ID, NAME) { + COMP_TYPE, + COMP_SUBTYPE, + COMP_MANUF, + 0, 0, 0, 0, // no 68K + 'STR ', RES_ID, + 'STR ', RES_ID + 1, + 0, 0, /* icon */ + VERSION, + componentHasMultiplePlatforms | componentDoAutoVersion, + 0, + { + #if defined(ppc_YES) + cmpThreadSafeOnMac, + 'dlle', RES_ID, platformPowerPCNativeEntryPoint + #define NeedLeadingComma 1 + #endif + #if defined(ppc64_YES) + #if defined(NeedLeadingComma) + , + #endif + cmpThreadSafeOnMac, + 'dlle', RES_ID, platformPowerPC64NativeEntryPoint + #define NeedLeadingComma 1 + #endif + #if defined(i386_YES) + #if defined(NeedLeadingComma) + , + #endif + cmpThreadSafeOnMac, + 'dlle', RES_ID, platformIA32NativeEntryPoint + #define NeedLeadingComma 1 + #endif + #if defined(x86_64_YES) + #if defined(NeedLeadingComma) + , + #endif + cmpThreadSafeOnMac, + 'dlle', RES_ID, 8 + #define NeedLeadingComma 1 + #endif + } +}; + +#undef RES_ID +#undef COMP_TYPE +#undef COMP_SUBTYPE +#undef COMP_MANUF +#undef VERSION +#undef NAME +#undef DESCRIPTION +#undef ENTRY_POINT +#undef NeedLeadingComma diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp index 647346ca..d80723e7 100644 --- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp +++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterApp.cpp @@ -29,7 +29,6 @@ #include "../utility/juce_IncludeModuleHeaders.h" #include "../utility/juce_FakeMouseMoveGenerator.h" #include "../utility/juce_WindowsHooks.h" -#include "../utility/juce_PluginBusUtilities.h" #include #include @@ -54,6 +53,19 @@ public: StandaloneFilterApp() { PluginHostType::jucePlugInClientCurrentWrapperType = AudioProcessor::wrapperType_Standalone; + + PropertiesFile::Options options; + + options.applicationName = getApplicationName(); + options.filenameSuffix = ".settings"; + options.osxLibrarySubFolder = "Application Support"; + #if JUCE_LINUX + options.folderName = "~/.config"; + #else + options.folderName = ""; + #endif + + appProperties.setStorageParameters (options); } const String getApplicationName() override { return JucePlugin_Name; } @@ -63,7 +75,7 @@ public: virtual StandaloneFilterWindow* createWindow() { - return new StandaloneFilterWindow (getApplicationName(), Colours::white, nullptr, true); + return new StandaloneFilterWindow (getApplicationName(), Colours::white, appProperties.getUserSettings(), false); } //============================================================================== @@ -81,6 +93,7 @@ public: void shutdown() override { mainWindow = nullptr; + appProperties.saveIfNeeded(); } //============================================================================== @@ -90,6 +103,7 @@ public: } protected: + ApplicationProperties appProperties; ScopedPointer mainWindow; }; diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h index b5b39e44..e69dbb66 100644 --- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h +++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h @@ -93,16 +93,7 @@ public: #endif jassert (processor != nullptr); // Your createPluginFilter() function must return a valid object! - // try to disable sidechain and aux buses - const int numInBuses = processor->busArrangement.inputBuses. size(); - const int numOutBuses = processor->busArrangement.outputBuses.size(); - - for (int busIdx = 1; busIdx < numInBuses; ++busIdx) - processor->setPreferredBusArrangement (true, busIdx, AudioChannelSet::disabled()); - - for (int busIdx = 1; busIdx < numOutBuses; ++busIdx) - processor->setPreferredBusArrangement (false, busIdx, AudioChannelSet::disabled()); - + processor->disableNonMainBuses(); processor->setRateAndBufferSizeDetails(44100, 512); } diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp index b5b7116a..37f4f3f5 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp @@ -84,7 +84,8 @@ #include "../utility/juce_IncludeModuleHeaders.h" #include "../utility/juce_FakeMouseMoveGenerator.h" #include "../utility/juce_WindowsHooks.h" -#include "../utility/juce_PluginBusUtilities.h" + +#include "../../juce_audio_processors/format_types/juce_VSTCommon.h" #ifdef _MSC_VER #pragma pack (pop) @@ -255,7 +256,6 @@ public: sampleRate (44100.f), blockSize (1024), filter (af), - busUtils (*filter, true, 64), chunkMemoryTime (0), isProcessing (false), isBypassed (false), @@ -270,28 +270,20 @@ public: #endif hostWindow (0) { - busUtils.init(); - // VST-2 does not support disabling buses: so always enable all of them - if (busUtils.hasDynamicInBuses() || busUtils.hasDynamicOutBuses()) - busUtils.enableAllBuses(); + filter->enableAllBuses(); - { - // Using the legacy Projucer field? Then keep the maximum number of channels - // as the default plug-in layout. Otherwise, leave it up to the user - // which default layout the prefer. - #ifndef JucePlugin_PreferredChannelConfigurations - PluginBusUtilities::ScopedBusRestorer busRestorer (busUtils); - #endif - - findMaxTotalChannels (maxNumInChannels, maxNumOutChannels); - bool success = setBusArrangementFromTotalChannelNum (maxNumInChannels, maxNumOutChannels); - ignoreUnused (success); - - // please file a bug if you hit this assertion! - jassert (maxNumInChannels == busUtils.findTotalNumChannels (true) && success - && maxNumOutChannels == busUtils.findTotalNumChannels (false)); - } + findMaxTotalChannels (maxNumInChannels, maxNumOutChannels); + + // You must at least have some channels + jassert (filter->isMidiEffect() || (maxNumInChannels > 0 || maxNumOutChannels > 0)); + + if (filter->isMidiEffect()) + maxNumInChannels = maxNumOutChannels = 2; + + #ifdef JucePlugin_PreferredChannelConfigurations + filter->setPlayConfigDetails (maxNumInChannels, maxNumOutChannels, 44100.0, 1024); + #endif filter->setRateAndBufferSizeDetails (0, 0); filter->setPlayHead (this); @@ -310,7 +302,13 @@ public: vstEffect.latency = filter->getLatencySamples(); vstEffect.effectPointer = this; vstEffect.plugInIdentifier = JucePlugin_VSTUniqueID; + + #ifdef JucePlugin_VSTChunkStructureVersion + vstEffect.plugInVersion = convertHexVersionToDecimal (JucePlugin_VSTChunkStructureVersion); + #else vstEffect.plugInVersion = convertHexVersionToDecimal (JucePlugin_VersionCode); + #endif + vstEffect.processAudioInplaceFunction = processReplacingCB; vstEffect.processDoubleAudioInplaceFunction = processDoubleReplacingCB; @@ -374,6 +372,8 @@ public: void internalProcessReplacing (FloatType** inputs, FloatType** outputs, int32 numSamples, VstTempBuffers& tmpBuffers) { + const bool isMidiEffect = filter->isMidiEffect(); + if (firstProcessCallback) { firstProcessCallback = false; @@ -399,7 +399,7 @@ public: #endif } - #if JUCE_DEBUG && ! JucePlugin_ProducesMidiOutput + #if JUCE_DEBUG && ! (JucePlugin_ProducesMidiOutput || JucePlugin_IsMidiEffect) const int numMidiEventsComingIn = midiEvents.getNumEvents(); #endif @@ -459,7 +459,7 @@ public: { const int numChannels = jmax (numIn, numOut); - AudioBuffer chans (tmpBuffers.channels, numChannels, numSamples); + AudioBuffer chans (tmpBuffers.channels, isMidiEffect ? 0 : numChannels, numSamples); if (isBypassed) filter->processBlockBypassed (chans, midiEvents); @@ -476,7 +476,7 @@ public: if (! midiEvents.isEmpty()) { - #if JucePlugin_ProducesMidiOutput + #if JucePlugin_ProducesMidiOutput || JucePlugin_IsMidiEffect const int numEvents = midiEvents.getNumEvents(); outgoingEvents.ensureSize (numEvents); @@ -572,13 +572,13 @@ public: host that we want midi. In the SDK this method is marked as deprecated, but some hosts rely on this behaviour. */ - if (vstEffect.flags & vstEffectFlagIsSynth || JucePlugin_WantsMidiInput) + if (vstEffect.flags & vstEffectFlagIsSynth || JucePlugin_WantsMidiInput || JucePlugin_IsMidiEffect) { if (hostCallback != nullptr) hostCallback (&vstEffect, hostOpcodePlugInWantsMidi, 0, 1, 0, 0); } - #if JucePlugin_ProducesMidiOutput + #if JucePlugin_ProducesMidiOutput || JucePlugin_IsMidiEffect outgoingEvents.ensureSize (512); #endif } @@ -753,53 +753,51 @@ public: bool getPinProperties (VstPinInfo& properties, bool direction, int index) const { + if (filter->isMidiEffect()) + return false; + + int channelIdx, busIdx; + // fill with default - properties.flags = vstPinInfoFlagValid; + properties.flags = 0; properties.text[0] = 0; properties.shortText[0] = 0; properties.configurationType = vstSpeakerConfigTypeEmpty; - // index refers to the absolute index when combining all channels of every bus - if (index >= (direction ? vstEffect.numInputChannels : vstEffect.numOutputChannels)) - return false; - - const int n = busUtils.getBusCount(direction); - int busIdx; - for (busIdx = 0; busIdx < n; ++busIdx) + if ((channelIdx = filter->getOffsetInBusBufferForAbsoluteChannelIndex (direction, index, busIdx)) >= 0) { - const int numChans = busUtils.getNumChannels (direction, busIdx); - if (index < numChans) - break; + AudioProcessor::Bus& bus = *filter->getBus (direction, busIdx); + const AudioChannelSet& channelSet = bus.getCurrentLayout(); + AudioChannelSet::ChannelType channelType = channelSet.getTypeOfChannel (channelIdx); - index -= numChans; - } - - if (busIdx >= n) - return true; - - const AudioProcessor::AudioProcessorBus& busInfo = busUtils.getFilterBus (direction).getReference (busIdx); - - String channelName = busInfo.name; - #ifdef JucePlugin_PreferredChannelConfigurations - channelName += String (" ") + String (index); - #else - if (busUtils.getNumChannels (direction, busIdx) > 1) - channelName += String (" ") + AudioChannelSet::getAbbreviatedChannelTypeName (busInfo.channels.getTypeOfChannel (index)); - #endif + properties.flags = vstPinInfoFlagIsActive | vstPinInfoFlagValid; + properties.configurationType = SpeakerMappings::channelSetToVstArrangementType (channelSet); + String label = bus.getName(); - channelName.copyToUTF8 (properties.text, (size_t) (vstMaxParameterOrPinLabelLength + 1)); - channelName.copyToUTF8 (properties.shortText, (size_t) (vstMaxParameterOrPinShortLabelLength + 1)); + #ifdef JucePlugin_PreferredChannelConfigurations + label += String (" ") + String (channelIdx); + #else + if (channelSet.size() > 1) + label += String (" ") + AudioChannelSet::getAbbreviatedChannelTypeName (channelType); + #endif - properties.flags = vstPinInfoFlagValid | vstPinInfoFlagIsActive; - properties.configurationType = SpeakerMappings::channelSetToVstArrangementType (busInfo.channels); + label.copyToUTF8 (properties.text, (size_t) (vstMaxParameterOrPinLabelLength + 1)); + label.copyToUTF8 (properties.shortText, (size_t) (vstMaxParameterOrPinShortLabelLength + 1)); - if (properties.configurationType == vstSpeakerConfigTypeEmpty) - properties.flags &= vstPinInfoFlagIsActive; + if (channelType == AudioChannelSet::left + || channelType == AudioChannelSet::leftSurround + || channelType == AudioChannelSet::leftCentre + || channelType == AudioChannelSet::leftSurroundSide + || channelType == AudioChannelSet::topFrontLeft + || channelType == AudioChannelSet::topRearLeft + || channelType == AudioChannelSet::leftSurroundRear + || channelType == AudioChannelSet::wideLeft) + properties.flags |= vstPinInfoFlagIsStereo; - if (busInfo.channels.size() == 2) - properties.flags |= vstPinInfoFlagIsStereo; + return true; + } - return true; + return false; } //============================================================================== @@ -829,6 +827,24 @@ public: static AudioChannelSet vstArrangementTypeToChannelSet (const VstSpeakerConfiguration& arr) { + if (arr.type == vstSpeakerConfigTypeEmpty) return AudioChannelSet::disabled(); + else if (arr.type == vstSpeakerConfigTypeMono) return AudioChannelSet::mono(); + else if (arr.type == vstSpeakerConfigTypeLR) return AudioChannelSet::stereo(); + else if (arr.type == vstSpeakerConfigTypeLRC) return AudioChannelSet::createLCR(); + else if (arr.type == vstSpeakerConfigTypeLRS) return AudioChannelSet::createLRS(); + else if (arr.type == vstSpeakerConfigTypeLRCS) return AudioChannelSet::createLCRS(); + else if (arr.type == vstSpeakerConfigTypeLRCLsRs) return AudioChannelSet::create5point0(); + else if (arr.type == vstSpeakerConfigTypeLRCLfeLsRs) return AudioChannelSet::create5point1(); + else if (arr.type == vstSpeakerConfigTypeLRCLsRsCs) return AudioChannelSet::create6point0(); + else if (arr.type == vstSpeakerConfigTypeLRCLfeLsRsCs) return AudioChannelSet::create6point1(); + else if (arr.type == vstSpeakerConfigTypeLRLsRsSlSr) return AudioChannelSet::create6point0Music(); + else if (arr.type == vstSpeakerConfigTypeLRLfeLsRsSlSr) return AudioChannelSet::create6point1Music(); + else if (arr.type == vstSpeakerConfigTypeLRCLsRsSlSr) return AudioChannelSet::create7point0(); + else if (arr.type == vstSpeakerConfigTypeLRCLsRsLcRc) return AudioChannelSet::create7point0SDDS(); + else if (arr.type == vstSpeakerConfigTypeLRCLfeLsRsSlSr) return AudioChannelSet::create7point1(); + else if (arr.type == vstSpeakerConfigTypeLRCLfeLsRsLcRc) return AudioChannelSet::create7point1SDDS(); + else if (arr.type == vstSpeakerConfigTypeLRLsRs) return AudioChannelSet::quadraphonic(); + for (const Mapping* m = getMappings(); m->vst2 != vstSpeakerConfigTypeEmpty; ++m) { if (m->vst2 == arr.type) @@ -847,6 +863,24 @@ public: static int32 channelSetToVstArrangementType (AudioChannelSet channels) { + if (channels == AudioChannelSet::disabled()) return vstSpeakerConfigTypeEmpty; + else if (channels == AudioChannelSet::mono()) return vstSpeakerConfigTypeMono; + else if (channels == AudioChannelSet::stereo()) return vstSpeakerConfigTypeLR; + else if (channels == AudioChannelSet::createLCR()) return vstSpeakerConfigTypeLRC; + else if (channels == AudioChannelSet::createLRS()) return vstSpeakerConfigTypeLRS; + else if (channels == AudioChannelSet::createLCRS()) return vstSpeakerConfigTypeLRCS; + else if (channels == AudioChannelSet::create5point0()) return vstSpeakerConfigTypeLRCLsRs; + else if (channels == AudioChannelSet::create5point1()) return vstSpeakerConfigTypeLRCLfeLsRs; + else if (channels == AudioChannelSet::create6point0()) return vstSpeakerConfigTypeLRCLsRsCs; + else if (channels == AudioChannelSet::create6point1()) return vstSpeakerConfigTypeLRCLfeLsRsCs; + else if (channels == AudioChannelSet::create6point0Music()) return vstSpeakerConfigTypeLRLsRsSlSr; + else if (channels == AudioChannelSet::create6point1Music()) return vstSpeakerConfigTypeLRLfeLsRsSlSr; + else if (channels == AudioChannelSet::create7point0()) return vstSpeakerConfigTypeLRCLsRsSlSr; + else if (channels == AudioChannelSet::create7point0SDDS()) return vstSpeakerConfigTypeLRCLsRsLcRc; + else if (channels == AudioChannelSet::create7point1()) return vstSpeakerConfigTypeLRCLfeLsRsSlSr; + else if (channels == AudioChannelSet::create7point1SDDS()) return vstSpeakerConfigTypeLRCLfeLsRsLcRc; + else if (channels == AudioChannelSet::quadraphonic()) return vstSpeakerConfigTypeLRLsRs; + Array chans (channels.getChannelTypes()); if (channels == AudioChannelSet::disabled()) @@ -881,31 +915,31 @@ public: { vstSpeakerConfigTypeLR, { left, right, unknown } }, { vstSpeakerConfigTypeLsRs, { leftSurround, rightSurround, unknown } }, { vstSpeakerConfigTypeLcRc, { leftCentre, rightCentre, unknown } }, - { vstSpeakerConfigTypeSlSr, { leftRearSurround, rightRearSurround, unknown } }, - { vstSpeakerConfigTypeCLfe, { centre, subbass, unknown } }, + { vstSpeakerConfigTypeSlSr, { leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeCLfe, { centre, LFE, unknown } }, { vstSpeakerConfigTypeLRC, { left, right, centre, unknown } }, { vstSpeakerConfigTypeLRS, { left, right, surround, unknown } }, - { vstSpeakerConfigTypeLRCLfe, { left, right, centre, subbass, unknown } }, - { vstSpeakerConfigTypeLRLfeS, { left, right, subbass, surround, unknown } }, + { vstSpeakerConfigTypeLRCLfe, { left, right, centre, LFE, unknown } }, + { vstSpeakerConfigTypeLRLfeS, { left, right, LFE, surround, unknown } }, { vstSpeakerConfigTypeLRCS, { left, right, centre, surround, unknown } }, { vstSpeakerConfigTypeLRLsRs, { left, right, leftSurround, rightSurround, unknown } }, - { vstSpeakerConfigTypeLRCLfeS, { left, right, centre, subbass, surround, unknown } }, - { vstSpeakerConfigTypeLRLfeLsRs, { left, right, subbass, leftSurround, rightSurround, unknown } }, + { vstSpeakerConfigTypeLRCLfeS, { left, right, centre, LFE, surround, unknown } }, + { vstSpeakerConfigTypeLRLfeLsRs, { left, right, LFE, leftSurround, rightSurround, unknown } }, { vstSpeakerConfigTypeLRCLsRs, { left, right, centre, leftSurround, rightSurround, unknown } }, - { vstSpeakerConfigTypeLRCLfeLsRs, { left, right, centre, subbass, leftSurround, rightSurround, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRs, { left, right, centre, LFE, leftSurround, rightSurround, unknown } }, { vstSpeakerConfigTypeLRCLsRsCs, { left, right, centre, leftSurround, rightSurround, surround, unknown } }, - { vstSpeakerConfigTypeLRLsRsSlSr, { left, right, leftSurround, rightSurround, leftRearSurround, rightRearSurround, unknown } }, - { vstSpeakerConfigTypeLRCLfeLsRsCs, { left, right, centre, subbass, leftSurround, rightSurround, surround, unknown } }, - { vstSpeakerConfigTypeLRLfeLsRsSlSr, { left, right, subbass, leftSurround, rightSurround, leftRearSurround, rightRearSurround, unknown } }, + { vstSpeakerConfigTypeLRLsRsSlSr, { left, right, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsCs, { left, right, centre, LFE, leftSurround, rightSurround, surround, unknown } }, + { vstSpeakerConfigTypeLRLfeLsRsSlSr, { left, right, LFE, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } }, { vstSpeakerConfigTypeLRCLsRsLcRc, { left, right, centre, leftSurround, rightSurround, topFrontLeft, topFrontRight, unknown } }, - { vstSpeakerConfigTypeLRCLsRsSlSr, { left, right, centre, leftSurround, rightSurround, leftRearSurround, rightRearSurround, unknown } }, - { vstSpeakerConfigTypeLRCLfeLsRsLcRc, { left, right, centre, subbass, leftSurround, rightSurround, topFrontLeft, topFrontRight, unknown } }, - { vstSpeakerConfigTypeLRCLfeLsRsSlSr, { left, right, centre, subbass, leftSurround, rightSurround, leftRearSurround, rightRearSurround, unknown } }, + { vstSpeakerConfigTypeLRCLsRsSlSr, { left, right, centre, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsLcRc, { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontRight, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsSlSr, { left, right, centre, LFE, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } }, { vstSpeakerConfigTypeLRCLsRsLcRcCs, { left, right, centre, leftSurround, rightSurround, topFrontLeft, topFrontRight, surround, unknown } }, - { vstSpeakerConfigTypeLRCLsRsCsSlSr, { left, right, centre, leftSurround, rightSurround, surround, leftRearSurround, rightRearSurround, unknown } }, - { vstSpeakerConfigTypeLRCLfeLsRsLcRcCs, { left, right, centre, subbass, leftSurround, rightSurround, topFrontLeft, topFrontRight, surround, unknown } }, - { vstSpeakerConfigTypeLRCLfeLsRsCsSlSr, { left, right, centre, subbass, leftSurround, rightSurround, surround, leftRearSurround, rightRearSurround, unknown } }, - { vstSpeakerConfigTypeLRCLfeLsRsTflTfcTfrTrlTrrLfe2, { left, right, centre, subbass, leftSurround, rightSurround, topFrontLeft, topFrontCentre, topFrontRight, topRearLeft, topRearRight, subbass2, unknown } }, + { vstSpeakerConfigTypeLRCLsRsCsSlSr, { left, right, centre, leftSurround, rightSurround, surround, leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsLcRcCs, { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontRight, surround, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsCsSlSr, { left, right, centre, LFE, leftSurround, rightSurround, surround, leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsTflTfcTfrTrlTrrLfe2, { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontCentre, topFrontRight, topRearLeft, topRearRight, LFE2, unknown } }, { vstSpeakerConfigTypeEmpty, { unknown } } }; @@ -919,14 +953,14 @@ public: case AudioChannelSet::left: return vstIndividualSpeakerTypeLeft; case AudioChannelSet::right: return vstIndividualSpeakerTypeRight; case AudioChannelSet::centre: return vstIndividualSpeakerTypeCentre; - case AudioChannelSet::subbass: return vstIndividualSpeakerTypeSubbass; + case AudioChannelSet::LFE: return vstIndividualSpeakerTypeLFE; case AudioChannelSet::leftSurround: return vstIndividualSpeakerTypeLeftSurround; case AudioChannelSet::rightSurround: return vstIndividualSpeakerTypeRightSurround; case AudioChannelSet::leftCentre: return vstIndividualSpeakerTypeLeftCentre; case AudioChannelSet::rightCentre: return vstIndividualSpeakerTypeRightCentre; case AudioChannelSet::surround: return vstIndividualSpeakerTypeSurround; - case AudioChannelSet::leftRearSurround: return vstIndividualSpeakerTypeLeftRearSurround; - case AudioChannelSet::rightRearSurround: return vstIndividualSpeakerTypeRightRearSurround; + case AudioChannelSet::leftSurroundRear: return vstIndividualSpeakerTypeLeftRearSurround; + case AudioChannelSet::rightSurroundRear: return vstIndividualSpeakerTypeRightRearSurround; case AudioChannelSet::topMiddle: return vstIndividualSpeakerTypeTopMiddle; case AudioChannelSet::topFrontLeft: return vstIndividualSpeakerTypeTopFrontLeft; case AudioChannelSet::topFrontCentre: return vstIndividualSpeakerTypeTopFrontCentre; @@ -934,7 +968,7 @@ public: case AudioChannelSet::topRearLeft: return vstIndividualSpeakerTypeTopRearLeft; case AudioChannelSet::topRearCentre: return vstIndividualSpeakerTypeTopRearCentre; case AudioChannelSet::topRearRight: return vstIndividualSpeakerTypeTopRearRight; - case AudioChannelSet::subbass2: return vstIndividualSpeakerTypeSubbass2; + case AudioChannelSet::LFE2: return vstIndividualSpeakerTypeLFE2; default: break; } @@ -948,14 +982,14 @@ public: case vstIndividualSpeakerTypeLeft: return AudioChannelSet::left; case vstIndividualSpeakerTypeRight: return AudioChannelSet::right; case vstIndividualSpeakerTypeCentre: return AudioChannelSet::centre; - case vstIndividualSpeakerTypeSubbass: return AudioChannelSet::subbass; + case vstIndividualSpeakerTypeLFE: return AudioChannelSet::LFE; case vstIndividualSpeakerTypeLeftSurround: return AudioChannelSet::leftSurround; case vstIndividualSpeakerTypeRightSurround: return AudioChannelSet::rightSurround; case vstIndividualSpeakerTypeLeftCentre: return AudioChannelSet::leftCentre; case vstIndividualSpeakerTypeRightCentre: return AudioChannelSet::rightCentre; case vstIndividualSpeakerTypeSurround: return AudioChannelSet::surround; - case vstIndividualSpeakerTypeLeftRearSurround: return AudioChannelSet::leftRearSurround; - case vstIndividualSpeakerTypeRightRearSurround: return AudioChannelSet::rightRearSurround; + case vstIndividualSpeakerTypeLeftRearSurround: return AudioChannelSet::leftSurroundRear; + case vstIndividualSpeakerTypeRightRearSurround: return AudioChannelSet::rightSurroundRear; case vstIndividualSpeakerTypeTopMiddle: return AudioChannelSet::topMiddle; case vstIndividualSpeakerTypeTopFrontLeft: return AudioChannelSet::topFrontLeft; case vstIndividualSpeakerTypeTopFrontCentre: return AudioChannelSet::topFrontCentre; @@ -963,7 +997,7 @@ public: case vstIndividualSpeakerTypeTopRearLeft: return AudioChannelSet::topRearLeft; case vstIndividualSpeakerTypeTopRearCentre: return AudioChannelSet::topRearCentre; case vstIndividualSpeakerTypeTopRearRight: return AudioChannelSet::topRearRight; - case vstIndividualSpeakerTypeSubbass2: return AudioChannelSet::subbass2; + case vstIndividualSpeakerTypeLFE2: return AudioChannelSet::LFE2; default: break; } @@ -1327,7 +1361,6 @@ private: int32 blockSize; VstEffectInterface vstEffect; AudioProcessor* filter; - PluginBusUtilities busUtils; juce::MemoryBlock chunkMemory; juce::uint32 chunkMemoryTime; ScopedPointer editorComp; @@ -1340,6 +1373,8 @@ private: VstTempBuffers doubleTempBuffers; int maxNumInChannels, maxNumOutChannels; + HeapBlock cachedInArrangement, cachedOutArrangement; + #if JUCE_MAC void* hostWindow; #elif JUCE_LINUX @@ -1418,213 +1453,32 @@ private: //============================================================================== void findMaxTotalChannels (int& maxTotalIns, int& maxTotalOuts) { - setMaxChannelsOnAllBuses (true); - setMaxChannelsOnAllBuses (false); - - maxTotalIns = busUtils.findTotalNumChannels (true); - maxTotalOuts = busUtils.findTotalNumChannels (false); - } - - void setMaxChannelsOnAllBuses (bool isInput) - { - const int n = busUtils.getBusCount (isInput); - - for (int i = 0; i < n; ++i) - { - int ch = busUtils.findMaxNumberOfChannelsForBus (isInput, i); - - if (ch == -1) - { - // VST-2 requires a maximum number of channels. If you are hitting this assertion - // then make sure that your setPreferredBusArrangement only accepts layouts - // up to a maximum number of channels - jassertfalse; - - // do something sensible if the above assertions was hit - ch = busUtils.getDefaultLayoutForBus (isInput, i).size(); - } - - AudioChannelSet set = - busUtils.getDefaultLayoutForChannelNumAndBus (isInput, i, ch); - - bool success = filter->setPreferredBusArrangement (isInput, i, set); - ignoreUnused (success); - - // If you are hitting this assertsion then please file bug! - jassert ((! set.isDisabled()) && success); - } - } - - - //============================================================================== - void resetAuxChannelsToDefaultLayout (bool isInput) const - { - // set side-chain and aux channels to their default layout - for (int busIdx = 1; busIdx < busUtils.getBusCount (isInput); ++busIdx) - { - bool success = filter->setPreferredBusArrangement (isInput, busIdx, busUtils.getDefaultLayoutForBus (isInput, busIdx)); - - // VST 2 only supports a static channel layout on aux/sidechain channels - // You must at least support the default layout regardless of the layout of the main bus. - // If this is a problem for your plug-in, then consider using VST-3. - jassert (success); - ignoreUnused (success); - } - } - - bool setBusArrangementFromTotalChannelNum (const int numInChannels, const int numOutChannels) - { - PluginBusUtilities::ScopedBusRestorer busRestorer (busUtils); - const int numIns = busUtils.getBusCount (true); - const int numOuts = busUtils.getBusCount (false); - - const int n = numIns + numOuts; - HeapBlock config (static_cast (n), true); - HeapBlock maxChans (static_cast (n), true); - - for (int i = 0; i < numIns; ++i) - maxChans[i] = busUtils.findMaxNumberOfChannelsForBus (true, i, numInChannels); - - for (int i = 0; i < numOuts; ++i) - maxChans[i + numIns] = busUtils.findMaxNumberOfChannelsForBus (false, i, numOutChannels); - - const int* inConfig = config.getData(); - const int* outConfig = config.getData() + numIns; - - #if JUCE_DEBUG - bool firstMatch = true; - AudioProcessor::AudioBusArrangement saveFirstMatch; - #endif + #if defined (JucePlugin_MaxNumInputChannels) && defined (JucePlugin_MaxNumOutputChannels) + maxTotalIns = JucePlugin_MaxNumInputChannels; + maxTotalOuts = JucePlugin_MaxNumOutputChannels; + #else + const int numInputBuses = filter->getBusCount (true); + const int numOutputBuses = filter->getBusCount (false); - for (int i = 0; i < n;) + if (numInputBuses > 1 || numOutputBuses > 1) { - if (sumOfConfig (inConfig, numIns) == numInChannels - && sumOfConfig (outConfig, numOuts) == numOutChannels) - { - if (applyConfiguration (inConfig, outConfig)) - { - #if JUCE_DEBUG - if (! firstMatch) - { - // Unfortunately, VST-2 requires that there is a unique plug-in bus - // arrangement for every x,y pair where x,y is the total number of - // input, output channels respectively. - jassertfalse; + maxTotalIns = maxTotalOuts = 0; - busUtils.restoreBusArrangement (saveFirstMatch); - return true; - } + for (int i = 0; i < numInputBuses; ++i) + maxTotalIns += filter->getChannelCountOfBus (true, i); - saveFirstMatch = filter->busArrangement; - firstMatch = false; - #else - busRestorer.release(); - return true; - #endif - } - } - - for (i = 0; i < n; ++i) - if ((config[i] = maxChans[i] ? (config[i] + 1) % maxChans[i] : 0) > 0) - break; + for (int i = 0; i < numOutputBuses; ++i) + maxTotalOuts += filter->getChannelCountOfBus (false, i); } - - #if JUCE_DEBUG - if (! firstMatch) + else { - busRestorer.release(); - busUtils.restoreBusArrangement (saveFirstMatch); - return true; + maxTotalIns = numInputBuses > 0 ? filter->getBus (true, 0)->getMaxSupportedChannels() : 0; + maxTotalOuts = numOutputBuses > 0 ? filter->getBus (false, 0)->getMaxSupportedChannels() : 0; } #endif - - return false; - } - - bool setBusConfiguration (bool isInput, const int config[], const int n) - { - Array& busArray = isInput ? filter->busArrangement.inputBuses - : filter->busArrangement.outputBuses; - - int idx; - for (idx = 0; idx < n; ++idx) - { - if (busArray.getReference (idx).channels.size() == (config [idx] + 1)) - continue; - - AudioChannelSet set; - if ((set = busUtils.getDefaultLayoutForChannelNumAndBus (isInput, idx, config [idx] + 1)).isDisabled()) - break; - - if (! filter->setPreferredBusArrangement (isInput, idx, set)) - break; - } - - return (idx >= n); - } - - bool configurationMatches (bool isInput, const int config[], const int n) - { - Array& busArray = isInput ? filter->busArrangement.inputBuses - : filter->busArrangement.outputBuses; - - int idx; - for (idx = 0; idx < n; ++idx) - if (busArray.getReference (idx).channels.size() != (config [idx] + 1)) - break; - - return (idx >= n); - } - - bool applyConfiguration (const int inConfig[], const int outConfig[]) - { - const int numIns = busUtils.getBusCount (true); - const int numOuts = busUtils.getBusCount (false); - - if (! setBusConfiguration (true, inConfig, numIns)) - return false; - - if (! setBusConfiguration (false, outConfig, numOuts)) - return false; - - // re-check configuration - if (configurationMatches (true, inConfig, numIns) && configurationMatches (false, outConfig, numOuts)) - return true; - - return false; - } - - void allocateSpeakerArrangement (VstSpeakerConfiguration** arrangement, int32 nChannels) - { - if (*arrangement) - delete [] (char*) *arrangement; - - // The last member of a full VstSpeakerConfiguration struct is an array of 8 - // VstIndividualSpeakerInfo. Here we only allocate space for channels we will - // actually use. - const size_t allocationSizeToSubtract = static_cast (8 - nChannels) * sizeof (VstIndividualSpeakerInfo); - const size_t allocationSize = sizeof (VstSpeakerConfiguration) - allocationSizeToSubtract; - char* newAllocation = new char[allocationSize]; - memset (newAllocation, 0, allocationSize); - - *arrangement = (VstSpeakerConfiguration*) newAllocation; - (*arrangement)->numberOfChannels = nChannels; - } - - //============================================================================== - bool pluginHasSidechainsOrAuxs() const - { - return (busUtils.getBusCount (true) > 1 || busUtils.getBusCount (false) > 1); } - static int sumOfConfig (const int config[], int num) noexcept - { - int retval = 0; - for (int i = 0; i < num; ++i) - retval += (config [i] + 1); - - return retval; - } + bool pluginHasSidechainsOrAuxs() const { return (filter->getBusCount (true) > 1 || filter->getBusCount (false) > 1); } //============================================================================== /** Host to plug-in calls. */ @@ -1849,7 +1703,7 @@ private: pointer_sized_int handlePreAudioProcessingEvents (VstOpCodeArguments args) { - #if JucePlugin_WantsMidiInput + #if JucePlugin_WantsMidiInput || JucePlugin_IsMidiEffect VSTMidiEventList::addEventsToMidiBuffer ((VstEventBlock*) args.ptr, midiEvents); return 1; #else @@ -1907,17 +1761,14 @@ private: pointer_sized_int handleSetSpeakerConfiguration (VstOpCodeArguments args) { - VstSpeakerConfiguration* pluginInput = reinterpret_cast (args.value); - VstSpeakerConfiguration* pluginOutput = (VstSpeakerConfiguration*) args.ptr; + VstSpeakerConfiguration* pluginInput = reinterpret_cast (args.value); + VstSpeakerConfiguration* pluginOutput = reinterpret_cast (args.ptr); - const int numIns = busUtils.getBusCount (true); - const int numOuts = busUtils.getBusCount (false);; - - if (pluginInput != nullptr && numIns == 0) + if (pluginHasSidechainsOrAuxs() || filter->isMidiEffect()) return 0; - if (pluginOutput != nullptr && numOuts == 0) - return 0; + const int numIns = filter->getBusCount (true); + const int numOuts = filter->getBusCount (false); if (pluginInput != nullptr && pluginInput->type >= 0) { @@ -1933,52 +1784,41 @@ private: return 0; } - if (numIns > 1 || numOuts > 1) - { - int newNumInChannels = (pluginInput != nullptr && pluginInput-> numberOfChannels >= 0) - ? pluginInput-> numberOfChannels - : busUtils.findTotalNumChannels (true); - int newNumOutChannels = (pluginOutput != nullptr && pluginOutput->numberOfChannels >= 0) - ? pluginOutput->numberOfChannels - : busUtils.findTotalNumChannels (false); + if (pluginInput != nullptr && pluginInput->numberOfChannels > 0 && numIns == 0) + return 0; - newNumInChannels = jmin (newNumInChannels, maxNumInChannels); - newNumOutChannels = jmin (newNumOutChannels, maxNumOutChannels); + if (pluginOutput != nullptr && pluginOutput->numberOfChannels > 0 && numOuts == 0) + return 0; - if (! setBusArrangementFromTotalChannelNum (newNumInChannels, newNumOutChannels)) + if (pluginInput != nullptr && pluginInput->type >= 0) + { + // inconsistent request? + if (SpeakerMappings::vstArrangementTypeToChannelSet (*pluginInput).size() != pluginInput->numberOfChannels) return 0; } - else - { - PluginBusUtilities::ScopedBusRestorer busRestorer (busUtils); - AudioChannelSet inLayoutType; - if (pluginInput != nullptr && pluginInput-> numberOfChannels >= 0) - { - inLayoutType = SpeakerMappings::vstArrangementTypeToChannelSet (*pluginInput); - if (busUtils.getChannelSet (true, 0) != inLayoutType) - if (! filter->setPreferredBusArrangement (true, 0, inLayoutType)) - return 0; - } + if (pluginOutput != nullptr && pluginOutput->type >= 0) + { + // inconsistent request? + if (SpeakerMappings::vstArrangementTypeToChannelSet (*pluginOutput).size() != pluginOutput->numberOfChannels) + return 0; + } - if (pluginOutput != nullptr && pluginOutput->numberOfChannels >= 0) - { - AudioChannelSet newType = SpeakerMappings::vstArrangementTypeToChannelSet (*pluginOutput); + AudioProcessor::BusesLayout layouts = filter->getBusesLayout(); - if (busUtils.getChannelSet (false, 0) != newType) - if (! filter->setPreferredBusArrangement (false, 0, newType)) - return 0; + if (pluginInput != nullptr && pluginInput-> numberOfChannels >= 0 && numIns > 0) + layouts.getChannelSet (true, 0) = SpeakerMappings::vstArrangementTypeToChannelSet (*pluginInput); - // re-check the input - if ((! inLayoutType.isDisabled()) && busUtils.getChannelSet (true, 0) != inLayoutType) - return 0; + if (pluginOutput != nullptr && pluginOutput->numberOfChannels >= 0 && numOuts > 0) + layouts.getChannelSet (false, 0) = SpeakerMappings::vstArrangementTypeToChannelSet (*pluginOutput); - busRestorer.release(); - } - } + #ifdef JucePlugin_PreferredChannelConfigurations + short configs[][2] = {JucePlugin_PreferredChannelConfigurations}; + if (! AudioProcessor::containsLayout (layouts, configs)) + return 0; + #endif - filter->setRateAndBufferSizeDetails(0, 0); - return 1; + return filter->setBusesLayout (layouts) ? 1 : 0; } pointer_sized_int handleSetBypass (VstOpCodeArguments args) @@ -2025,7 +1865,7 @@ private: || strcmp (text, "receiveVstMidiEvent") == 0 || strcmp (text, "receiveVstMidiEvents") == 0) { - #if JucePlugin_WantsMidiInput + #if JucePlugin_WantsMidiInput || JucePlugin_IsMidiEffect return 1; #else return -1; @@ -2036,7 +1876,7 @@ private: || strcmp (text, "sendVstMidiEvent") == 0 || strcmp (text, "sendVstMidiEvents") == 0) { - #if JucePlugin_ProducesMidiOutput + #if JucePlugin_ProducesMidiOutput || JucePlugin_IsMidiEffect return 1; #else return -1; @@ -2094,30 +1934,25 @@ private: pointer_sized_int handleGetSpeakerConfiguration (VstOpCodeArguments args) { - VstSpeakerConfiguration** pluginInput = reinterpret_cast (args.value); - VstSpeakerConfiguration** pluginOutput = (VstSpeakerConfiguration**) args.ptr; - *pluginInput = nullptr; - *pluginOutput = nullptr; + VstSpeakerConfiguration** pluginInput = reinterpret_cast (args.value); + VstSpeakerConfiguration** pluginOutput = reinterpret_cast (args.ptr); - allocateSpeakerArrangement (pluginInput, busUtils.findTotalNumChannels (true)); - allocateSpeakerArrangement (pluginOutput, busUtils.findTotalNumChannels (false)); + if (pluginHasSidechainsOrAuxs() || filter->isMidiEffect()) + return false; - if (pluginHasSidechainsOrAuxs()) - { - int numIns = busUtils.findTotalNumChannels (true); - int numOuts = busUtils.findTotalNumChannels (false); + AudioChannelSet inputLayout = filter->getChannelLayoutOfBus (true, 0); + AudioChannelSet outputLayout = filter->getChannelLayoutOfBus (false, 0); - AudioChannelSet layout = AudioChannelSet::canonicalChannelSet (numIns); - SpeakerMappings::channelSetToVstArrangement (layout, **pluginInput); + const std::size_t speakerBaseSize = sizeof (VstSpeakerConfiguration) - (sizeof (VstIndividualSpeakerInfo) * 8); - layout = AudioChannelSet::canonicalChannelSet (numOuts); - SpeakerMappings::channelSetToVstArrangement (layout, **pluginOutput); - } - else - { - SpeakerMappings::channelSetToVstArrangement (busUtils.getChannelSet (true, 0), **pluginInput); - SpeakerMappings::channelSetToVstArrangement (busUtils.getChannelSet (false, 0), **pluginOutput); - } + cachedInArrangement .malloc (speakerBaseSize + (static_cast (inputLayout. size()) * sizeof (VstSpeakerConfiguration)), 1); + cachedOutArrangement.malloc (speakerBaseSize + (static_cast (outputLayout.size()) * sizeof (VstSpeakerConfiguration)), 1); + + *pluginInput = cachedInArrangement. getData(); + *pluginOutput = cachedOutArrangement.getData(); + + SpeakerMappings::channelSetToVstArrangement (filter->getChannelLayoutOfBus (true, 0), **pluginInput); + SpeakerMappings::channelSetToVstArrangement (filter->getChannelLayoutOfBus (false, 0), **pluginOutput); return 1; } diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm index 929b31ea..c510e8fb 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm @@ -69,7 +69,7 @@ static pascal OSStatus viewBoundsChangedEvent (EventHandlerCallRef, EventRef, vo static bool shouldManuallyCloseHostWindow() { - return getHostType().isCubase7orLater() || getHostType().isRenoise(); + return getHostType().isCubase7orLater() || getHostType().isRenoise() || ((SystemStats::getOperatingSystemType() & 0xff) >= 12); } #endif diff --git a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp index 345addae..b7782231 100644 --- a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp @@ -39,7 +39,6 @@ #include "../utility/juce_CheckSettingMacros.h" #include "../utility/juce_IncludeModuleHeaders.h" #include "../utility/juce_WindowsHooks.h" -#include "../utility/juce_PluginBusUtilities.h" #include "../utility/juce_FakeMouseMoveGenerator.h" #include "../../juce_audio_processors/format_types/juce_VST3Common.h" @@ -445,6 +444,9 @@ public: setParamNormalized (paramPreset, static_cast (pluginInstance->getCurrentProgram()) / static_cast (numPrograms - 1)); } + if (Vst::IComponentHandler* handler = getComponentHandler()) + handler->restartComponent (Vst::kParamValuesChanged); + return Vst::EditController::setComponentState (stream); } @@ -630,14 +632,14 @@ private: parameterToMidiControllerOffset = static_cast (usingManagedParameter ? paramMidiControllerOffset : parameters.getParameterCount()); - initialiseMidiControllerMappings (); + initialiseMidiControllerMappings(); #endif audioProcessorChanged (pluginInstance); } } - void initialiseMidiControllerMappings () + void initialiseMidiControllerMappings() { for (int c = 0, p = 0; c < numMIDIChannels; ++c) { @@ -964,8 +966,7 @@ public: pluginInstance (createPluginFilterOfType (AudioProcessor::wrapperType_VST3)), host (h), isMidiInputBusEnabled (false), - isMidiOutputBusEnabled (false), - busUtils (*pluginInstance, false) + isMidiOutputBusEnabled (false) { #if JucePlugin_WantsMidiInput isMidiInputBusEnabled = true; @@ -975,15 +976,19 @@ public: isMidiOutputBusEnabled = true; #endif - busUtils.init(); + #ifdef JucePlugin_PreferredChannelConfigurations + short configs[][2] = {JucePlugin_PreferredChannelConfigurations}; + const int numConfigs = sizeof (configs) / sizeof (short[2]); + + jassert (numConfigs > 0 && (configs[0][0] > 0 || configs[0][1] > 0)); + + pluginInstance->setPlayConfigDetails (configs[0][0], configs[0][1], 44100.0, 1024); + #endif // VST-3 requires your default layout to be non-discrete! // For example, your default layout must be mono, stereo, quadrophonic // and not AudioChannelSet::discreteChannels (2) etc. - jassert (busUtils.checkBusFormatsAreNotDiscrete()); - - copyBusArrangements (currentBusState.inputBuses, pluginInstance->busArrangement.inputBuses, Vst::kInput); - copyBusArrangements (currentBusState.outputBuses, pluginInstance->busArrangement.outputBuses, Vst::kOutput); + jassert (checkBusFormatsAreNotDiscrete()); comPluginInstance = new JuceAudioProcessor (pluginInstance); @@ -1537,8 +1542,7 @@ public: Steinberg::int32 PLUGIN_API getBusCount (Vst::MediaType type, Vst::BusDirection dir) override { if (type == Vst::kAudio) - return (dir == Vst::kInput ? pluginInstance->busArrangement.inputBuses - : pluginInstance->busArrangement.outputBuses).size(); + return pluginInstance->getBusCount (dir == Vst::kInput); if (type == Vst::kEvent) { @@ -1552,31 +1556,17 @@ public: return 0; } - static const AudioProcessor::AudioProcessorBus* getAudioBus (AudioProcessor::AudioBusArrangement& busArrangement, - Vst::BusDirection dir, Steinberg::int32 index) noexcept - { - const Array& buses = dir == Vst::kInput ? busArrangement.inputBuses - : busArrangement.outputBuses; - - return isPositiveAndBelow (index, static_cast (buses.size())) ? &buses.getReference (index) : nullptr; - } - - const AudioProcessor::AudioProcessorBus* getAudioBus (Vst::BusDirection dir, Steinberg::int32 index) const noexcept - { - return getAudioBus (pluginInstance->busArrangement, dir, index); - } - tresult PLUGIN_API getBusInfo (Vst::MediaType type, Vst::BusDirection dir, Steinberg::int32 index, Vst::BusInfo& info) override { if (type == Vst::kAudio) { - if (const AudioProcessor::AudioProcessorBus* bus = getAudioBus (currentBusState, dir, index)) + if (const AudioProcessor::Bus* bus = pluginInstance->getBus (dir == Vst::kInput, index)) { info.mediaType = Vst::kAudio; info.direction = dir; - info.channelCount = bus->channels.size(); - toString128 (info.name, bus->name); + info.channelCount = bus->getLastEnabledLayout().size(); + toString128 (info.name, bus->getName()); #if JucePlugin_IsSynth info.busType = (dir == Vst::kInput && index > 0 ? Vst::kAux : Vst::kMain); @@ -1584,7 +1574,7 @@ public: info.busType = (index == 0 ? Vst::kMain : Vst::kAux); #endif - info.flags = busUtils.isBusEnabledByDefault (dir == Vst::kInput, index) ? Vst::BusInfo::kDefaultActive : 0; + info.flags = (bus->isEnabledByDefault()) ? Vst::BusInfo::kDefaultActive : 0; return kResultTrue; } } @@ -1638,104 +1628,59 @@ public: } if (type == Vst::kAudio) - { - if (const AudioProcessor::AudioProcessorBus* bus = getAudioBus (dir, index)) - { - if (state == (bus->channels.size() > 0)) - return kResultTrue; - - AudioChannelSet newChannels; - - if (state) - if (const AudioProcessor::AudioProcessorBus* lastBusState = getAudioBus (currentBusState, dir, index)) - newChannels = lastBusState->channels; - - if (pluginInstance->setPreferredBusArrangement (dir == Vst::kInput, index, newChannels)) - return kResultTrue; - } - } + if (AudioProcessor::Bus* bus = pluginInstance->getBus (dir == Vst::kInput, index)) + return (bus->enable (state != 0) ? kResultTrue : kResultFalse); return kResultFalse; } - void copyBusArrangements (Array& copies, - const Array& source, - Vst::BusDirection dir) + bool checkBusFormatsAreNotDiscrete() { - for (int i = 0; i < source.size(); ++i) - { - AudioProcessor::AudioProcessorBus bus = source.getReference (i); + const int numInputBuses = pluginInstance->getBusCount (true); + const int numOutputBuses = pluginInstance->getBusCount (false); - if (bus.channels.size() == 0 && i < copies.size()) - bus = AudioProcessor::AudioProcessorBus (bus.name, copies.getReference (i).channels); + for (int i = 0; i < numInputBuses; ++i) + if (pluginInstance->getChannelLayoutOfBus (true, i).isDiscreteLayout()) + return false; - if (bus.channels.size() == 0) - bus = AudioProcessor::AudioProcessorBus (bus.name, busUtils.getDefaultLayoutForBus (dir == Vst::kInput, i)); + for (int i = 0; i < numOutputBuses; ++i) + if (pluginInstance->getChannelLayoutOfBus (false, i).isDiscreteLayout()) + return false; - copies.set (i, bus); - } + return true; } tresult PLUGIN_API setBusArrangements (Vst::SpeakerArrangement* inputs, Steinberg::int32 numIns, Vst::SpeakerArrangement* outputs, Steinberg::int32 numOuts) override { - PluginBusUtilities::ScopedBusRestorer restorer (busUtils); - - Array inputsEnabled, outputsEnabled; - - // save enabled/disabled state of buses - for (int i = 0; i < busUtils.getBusCount (true); ++i) - inputsEnabled.add (busUtils.isBusEnabled (true, i)); + const int numInputBuses = pluginInstance->getBusCount (true); + const int numOutputBuses = pluginInstance->getBusCount (false); - for (int i = 0; i < busUtils.getBusCount (false); ++i) - outputsEnabled.add (busUtils.isBusEnabled (false, i)); - - // set the buses - for (int i = 0; i < numIns; ++i) - if (! pluginInstance->setPreferredBusArrangement (true, i, getChannelSetForSpeakerArrangement (inputs[i]))) - return kInvalidArgument; + if (numIns > numInputBuses || numOuts > numOutputBuses) + return false; - for (int i = 0; i < numOuts; ++i) - if (! pluginInstance->setPreferredBusArrangement (false, i, getChannelSetForSpeakerArrangement (outputs[i]))) - return kInvalidArgument; + AudioProcessor::BusesLayout requested = pluginInstance->getBusesLayout(); - // re-check if the bus arrangement mateches the request for (int i = 0; i < numIns; ++i) - if (getChannelSetForSpeakerArrangement (inputs[i]) != busUtils.getChannelSet (true, i)) - return kInvalidArgument; + requested.getChannelSet (true, i) = getChannelSetForSpeakerArrangement (inputs[i]); for (int i = 0; i < numOuts; ++i) - if (getChannelSetForSpeakerArrangement (outputs[i]) != busUtils.getChannelSet (false, i)) - return kInvalidArgument; - - // save the state of the plug-in layout - copyBusArrangements (currentBusState.inputBuses, pluginInstance->busArrangement.inputBuses, Vst::kInput); - copyBusArrangements (currentBusState.outputBuses, pluginInstance->busArrangement.outputBuses, Vst::kOutput); - - // re-enable/disable the buses - for (int i = 0; i < busUtils.getBusCount (true); ++i) - if (! inputsEnabled.getReference (i) && busUtils.isBusEnabled (true, i)) - if (! pluginInstance->setPreferredBusArrangement (true, i, AudioChannelSet())) - return kInvalidArgument; - - for (int i = 0; i < busUtils.getBusCount (false); ++i) - if (! outputsEnabled.getReference (i) && busUtils.isBusEnabled (false, i)) - if (! pluginInstance->setPreferredBusArrangement (false, i, AudioChannelSet())) - return kInvalidArgument; + requested.getChannelSet (false, i) = getChannelSetForSpeakerArrangement (outputs[i]); - restorer.release(); - - preparePlugin (getPluginInstance().getSampleRate(), - getPluginInstance().getBlockSize()); + #ifdef JucePlugin_PreferredChannelConfigurations + short configs[][2] = {JucePlugin_PreferredChannelConfigurations}; + if (! AudioProcessor::containsLayout (requested, configs)) + return kResultFalse; + #endif - return kResultTrue; + return (pluginInstance->setBusesLayoutWithoutEnabling (requested) ? kResultTrue : kResultFalse); } tresult PLUGIN_API getBusArrangement (Vst::BusDirection dir, Steinberg::int32 index, Vst::SpeakerArrangement& arr) override { - if (const AudioProcessor::AudioProcessorBus* bus = getAudioBus (currentBusState, dir, index)) + if (AudioProcessor::Bus* bus = pluginInstance->getBus (dir == Vst::kInput, index)) { - arr = getSpeakerArrangement (bus->channels); + arr = getVst3SpeakerArrangement (bus->getLastEnabledLayout()); return kResultTrue; } @@ -1919,9 +1864,7 @@ private: Array channelListFloat; Array channelListDouble; - AudioProcessor::AudioBusArrangement currentBusState; bool isMidiInputBusEnabled, isMidiOutputBusEnabled; - PluginBusUtilities busUtils; ScopedJuceInitialiser_GUI libraryInitialiser; @@ -1999,7 +1942,7 @@ private: processParameterChanges (*data.inputParameterChanges); #if JUCE_DEBUG && ! JucePlugin_ProducesMidiOutput - const int numMidiEventsComingIn = midiBuffer.getNumEvents (); + const int numMidiEventsComingIn = midiBuffer.getNumEvents(); #endif if (pluginInstance->isSuspended()) @@ -2101,7 +2044,8 @@ private: // Consider yourself very unlucky if you hit this assertion. The hash code of your // parameter ids are not unique. - jassert (! vstParamIDs.contains (static_cast (paramID))); + jassert (! vstParamIDs.contains (static_cast (paramID))); + vstParamIDs.add (paramID); paramMap.set (static_cast (paramID), i); diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client.h b/modules/juce_audio_plugin_client/juce_audio_plugin_client.h index 4cf04165..4b015e6a 100644 --- a/modules/juce_audio_plugin_client/juce_audio_plugin_client.h +++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client.h @@ -33,7 +33,7 @@ ID: juce_audio_plugin_client vendor: juce - version: 4.2.4 + version: 4.3.0 name: JUCE audio plugin wrapper classes description: Classes for building VST, VST3, AudioUnit, AAX and RTAS plugins. website: http://www.juce.com/juce diff --git a/modules/juce_audio_plugin_client/utility/juce_PluginBusUtilities.h b/modules/juce_audio_plugin_client/utility/juce_PluginBusUtilities.h deleted file mode 100644 index 143e2e97..00000000 --- a/modules/juce_audio_plugin_client/utility/juce_PluginBusUtilities.h +++ /dev/null @@ -1,536 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library. - Copyright (c) 2015 - ROLI Ltd. - - Permission is granted to use this software under the terms of either: - a) the GPL v2 (or any later version) - b) the Affero GPL v3 - - Details of these licenses can be found at: www.gnu.org/licenses - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.juce.com for more information. - - ============================================================================== -*/ - -struct PluginBusUtilities -{ - //============================================================================== - typedef Array AudioBusArray; - - //============================================================================== - PluginBusUtilities (AudioProcessor& plugin, bool markDiscreteLayoutsAsSupported, int maxProbeChannels = kDefaultMaxChannels) - : processor (plugin), - dynamicInBuses (false), - dynamicOutBuses (false), - plugInFormatSupportsDiscreteLayouts (markDiscreteLayoutsAsSupported), - maxChannelsToProbe (maxProbeChannels) - { - } - - // this will invoke setPreferredLayout many times - void init() { populateLayoutDetails(); } - - //============================================================================== - // Useful short-cuts - AudioBusArray& getFilterBus (bool inputBus) noexcept { return inputBus ? processor.busArrangement.inputBuses : processor.busArrangement.outputBuses; } - const AudioBusArray& getFilterBus (bool inputBus) const noexcept { return inputBus ? processor.busArrangement.inputBuses : processor.busArrangement.outputBuses; } - int getBusCount (bool inputBus) const noexcept { return getFilterBus (inputBus).size(); } - AudioChannelSet getChannelSet (bool inp, int bus) noexcept { return isPositiveAndBelow (bus, getBusCount (inp)) ? getFilterBus (inp).getReference (bus).channels : AudioChannelSet(); } - int getNumChannels (bool inp, int bus) const noexcept { return isPositiveAndBelow (bus, getBusCount (inp)) ? getFilterBus (inp).getReference (bus).channels.size() : 0; } - bool isBusEnabled (bool inputBus, int bus) const noexcept { return (getNumChannels (inputBus, bus) > 0); } - bool hasInputs (int bus) const noexcept { return isBusEnabled (true, bus); } - bool hasOutputs (int bus) const noexcept { return isBusEnabled (false, bus); } - bool hasDynamicInBuses() const noexcept { return dynamicInBuses; } - bool hasDynamicOutBuses() const noexcept { return dynamicOutBuses; } - - //============================================================================== - // Channel Counters - int getNumEnabledBuses (bool inputBus) const noexcept { int i; for (i = 0; i < getBusCount (inputBus); ++i) if (! isBusEnabled (inputBus, i)) break; return i; } - - int findTotalNumChannels (bool isInput, int busOffset = 0) const noexcept - { - int total = 0; - const AudioBusArray& ioBuses = getFilterBus (isInput); - - for (int i = busOffset; i < ioBuses.size(); ++i) - total += ioBuses.getReference (i).channels.size(); - - return total; - } - - int getBusIdxForChannelIdx (bool isInput, int channelIdx, int& totalChannels, int startBusIdx) - { - const int numBuses = getBusCount (isInput); - - for (int busIdx = startBusIdx; busIdx < numBuses; ++busIdx) - { - const int numChannels = getNumChannels (isInput, busIdx); - if ((totalChannels + numChannels) > channelIdx) - return busIdx; - - totalChannels += numChannels; - } - - return -1; - } - - int getBusIdxForChannelIdx (bool isInput, int channelIdx) - { - int totalChannels = 0; - return getBusIdxForChannelIdx (isInput, channelIdx, totalChannels, 0); - } - - //============================================================================== - // Bus properties & defaults - bool busIgnoresLayout (bool inp, int bus) const noexcept - { - return isPositiveAndBelow (bus, getLayoutDetails (inp).size()) ? getBusLayoutDetails (inp, bus).busIgnoresLayout : true; - } - - bool busCanBeDisabled (bool inp, int bus) const noexcept - { - return isPositiveAndBelow (bus, getLayoutDetails (inp).size()) ? getBusLayoutDetails (inp, bus).canBeDisabled : false; - } - - bool isBusEnabledByDefault (bool inp, int bus) const noexcept - { - return isPositiveAndBelow (bus, getLayoutDetails (inp).size()) ? getBusLayoutDetails (inp, bus).isEnabledByDefault : true; - } - - bool checkBusFormatsAreNotDiscrete() const { return (checkBusFormatsAreNotDiscrete (true) && checkBusFormatsAreNotDiscrete (false)); } - - const AudioChannelSet& getDefaultLayoutForBus (bool isInput, int busIdx) const noexcept { return getBusLayoutDetails (isInput, busIdx).defaultLayout; } - - AudioChannelSet getDefaultLayoutForChannelNumAndBus (bool isInput, int busIdx, int channelNum) const noexcept - { - if (busIdx < 0 || busIdx >= getBusCount (isInput) || channelNum == 0) - return AudioChannelSet::disabled(); - - const BusLayoutDetails& layouts = getBusLayoutDetails (isInput, busIdx); - - const AudioChannelSet& dflt = layouts.defaultLayout; - const AudioChannelSet discreteChannels = AudioChannelSet::discreteChannels (channelNum); - - if (dflt.size() == channelNum && (plugInFormatSupportsDiscreteLayouts || (! dflt.isDiscreteLayout()))) - return dflt; - - Array potentialLayouts = layoutListCompatibleWithChannelCount (channelNum); - - ScopedBusRestorer busRestorer (*this); - - // prefer non-discrete layouts if no explicit default layout is given - const int n = potentialLayouts.size(); - for (int i = 0; i < n; ++i) - { - const AudioChannelSet& layout = potentialLayouts.getReference (i); - if (processor.setPreferredBusArrangement (isInput, busIdx, layout)) - return layout; - } - - - if (plugInFormatSupportsDiscreteLayouts && processor.setPreferredBusArrangement (isInput, busIdx, discreteChannels)) - return discreteChannels; - - // we are out of options, bail out - return AudioChannelSet(); - } - - //============================================================================== - // This function is quite heavy so please cache the return value - int findMaxNumberOfChannelsForBus (bool isInput, int busNr, int upperlimit = std::numeric_limits::max()) - { - int maxChannelsPreprocessorDefs = -1; - #ifdef JucePlugin_MaxNumInputChannels - if (isInput) - maxChannelsPreprocessorDefs = jmin (upperlimit, JucePlugin_MaxNumInputChannels); - #endif - - #ifdef JucePlugin_MaxNumOutputChannels - if (! isInput) - maxChannelsPreprocessorDefs = jmin (upperlimit, JucePlugin_MaxNumOutputChannels); - #endif - - #ifdef JucePlugin_PreferredChannelConfigurations - if (busNr == 0) - { - int maxChannelCount = 0; - const short channelConfigs[][2] = { JucePlugin_PreferredChannelConfigurations }; - const int numChannelConfigs = sizeof (channelConfigs) / sizeof (*channelConfigs); - - for (int i = 0; i < numChannelConfigs; ++i) - { - const int numChannels = channelConfigs [i][isInput ? 0 : 1]; - if (numChannels < 0) - return -1; - - maxChannelCount = jmax (maxChannelCount, numChannels); - } - - return jmin (upperlimit, maxChannelCount); - } - #endif - - ScopedBusRestorer busRestorer (*this); - - if (plugInFormatSupportsDiscreteLayouts && - processor.setPreferredBusArrangement(isInput, busNr, AudioChannelSet::discreteChannels (insaneNumberOfChannels))) - return -1; // no limit in channels - - int n = maxChannelsPreprocessorDefs > 0 ? maxChannelsPreprocessorDefs - : (plugInFormatSupportsDiscreteLayouts ? maxChannelsToProbe - : maxNumChannelsOfNonDiscreteLayouts); - - n = jmin (upperlimit, n); - - for (int i = n; i > 0; --i) - { - if (plugInFormatSupportsDiscreteLayouts && processor.setPreferredBusArrangement (isInput, busNr, AudioChannelSet::discreteChannels (i))) - return i; - - Array sets = layoutListCompatibleWithChannelCount (i); - - for (int j = 0; j < sets.size(); ++j) - { - const AudioChannelSet& layout = sets.getReference (j); - - if (processor.setPreferredBusArrangement (isInput, busNr, layout)) - return i; - } - } - - return 0; - } - - //============================================================================== - void restoreBusArrangement (const AudioProcessor::AudioBusArrangement& original) const - { - const int numInputBuses = getBusCount (true); - const int numOutputBuses = getBusCount (false); - - jassert (original.inputBuses. size() == numInputBuses); - jassert (original.outputBuses.size() == numOutputBuses); - - for (int busNr = 0; busNr < numInputBuses; ++busNr) - processor.setPreferredBusArrangement (true, busNr, original.inputBuses.getReference (busNr).channels); - - for (int busNr = 0; busNr < numOutputBuses; ++busNr) - processor.setPreferredBusArrangement (false, busNr, original.outputBuses.getReference (busNr).channels); - } - - void enableAllBuses() - { - for (int busIdx = 1; busIdx < getBusCount (true); ++busIdx) - if (getChannelSet (true, busIdx) == AudioChannelSet::disabled()) - processor.setPreferredBusArrangement (true, busIdx, getDefaultLayoutForBus (true, busIdx)); - - for (int busIdx = 1; busIdx < getBusCount (false); ++busIdx) - if (getChannelSet (false, busIdx) == AudioChannelSet::disabled()) - processor.setPreferredBusArrangement (false, busIdx, getDefaultLayoutForBus (false, busIdx)); - } - - //============================================================================== - // Helper class which restores the original arrangement when it leaves scope - class ScopedBusRestorer - { - public: - ScopedBusRestorer (const PluginBusUtilities& bUtils) - : busUtils (bUtils), - originalArr (bUtils.processor.busArrangement), - shouldRestore (true) - {} - - ~ScopedBusRestorer() - { - if (shouldRestore) - busUtils.restoreBusArrangement (originalArr); - } - - void release() noexcept { shouldRestore = false; } - - private: - const PluginBusUtilities& busUtils; - const AudioProcessor::AudioBusArrangement originalArr; - bool shouldRestore; - - JUCE_DECLARE_NON_COPYABLE (ScopedBusRestorer) - }; - - //============================================================================== - AudioProcessor& processor; - - enum - { - kDefaultMaxChannels = 64 - }; - -private: - friend class ScopedBusRestorer; - - enum - { - maxNumChannelsOfNonDiscreteLayouts = 8, // surround 7.1 has the maximum amount of channels - pseudoChannelBitNum = 90, // use this bit index to check if plug-in really doesn't care about layouts - insaneNumberOfChannels = 512 - }; - - //============================================================================== - // the first layout is the default layout - struct BusLayoutDetails - { - BusLayoutDetails() : busIgnoresLayout (true), canBeDisabled (false), isEnabledByDefault (false) {} - - AudioChannelSet defaultLayout; - bool busIgnoresLayout, canBeDisabled, isEnabledByDefault; - }; - - Array& getLayoutDetails (bool isInput) noexcept { return isInput ? inputLayouts : outputLayouts; } - const Array& getLayoutDetails (bool isInput) const noexcept { return isInput ? inputLayouts : outputLayouts; } - BusLayoutDetails& getBusLayoutDetails (bool isInput, int busNr) noexcept { return getLayoutDetails (isInput).getReference (busNr); } - const BusLayoutDetails& getBusLayoutDetails (bool isInput, int busNr) const noexcept { return getLayoutDetails (isInput).getReference (busNr); } - - //============================================================================== - Array inputLayouts, outputLayouts; - bool dynamicInBuses, dynamicOutBuses, plugInFormatSupportsDiscreteLayouts; - int maxChannelsToProbe; - - //============================================================================== - void populateLayoutDetails() - { - clear (getBusCount (true), getBusCount (false)); - - // save the default layouts - for (int i = 0; i < getBusCount (true); ++i) - getBusLayoutDetails (true, i).defaultLayout = getChannelSet (true, i); - - for (int i = 0; i < getBusCount (false); ++i) - getBusLayoutDetails (false, i).defaultLayout = getChannelSet (false, i); - - { - ScopedBusRestorer restorer (*this); - - - for (int i = 0; i < getBusCount (true); ++i) addLayoutDetails (true, i); - for (int i = 0; i < getBusCount (false); ++i) addLayoutDetails (false, i); - - // find the defaults - for (int i = 0; i < getBusCount (true); ++i) - updateDefaultLayout (true, i); - - for (int i = 0; i < getBusCount (false); ++i) - updateDefaultLayout (false, i); - } - - // can any of the buses be disabled/enabled - dynamicInBuses = doesPlugInHaveDynamicBuses (true); - dynamicOutBuses = doesPlugInHaveDynamicBuses (false); - } - - //============================================================================== - bool busIgnoresLayoutForChannelNum (bool isInput, int busNr, int channelNum) - { - AudioChannelSet set; - - // If the plug-in does not complain about setting it's layout to an undefined layout - // then we assume that the plug-in ignores the layout altogether - for (int i = 0; i < channelNum; ++i) - set.addChannel (static_cast (pseudoChannelBitNum + i)); - - return processor.setPreferredBusArrangement (isInput, busNr, set); - } - - void addLayoutDetails (bool isInput, int busNr) - { - BusLayoutDetails& layouts = getBusLayoutDetails (isInput, busNr); - - // check if the plug-in bus can be disabled - layouts.canBeDisabled = processor.setPreferredBusArrangement (isInput, busNr, AudioChannelSet()); - layouts.busIgnoresLayout = true; - - for (int i = 1; i <= maxNumChannelsOfNonDiscreteLayouts; ++i) - { - const bool ignoresLayoutForChannel = busIgnoresLayoutForChannelNum (isInput, busNr, i); - - Array sets = layoutListCompatibleWithChannelCount (i); - - for (int j = 0; j < sets.size(); ++j) - { - const AudioChannelSet& layout = sets.getReference (j); - - if (processor.setPreferredBusArrangement (isInput, busNr, layout)) - { - if (! ignoresLayoutForChannel) - { - layouts.busIgnoresLayout = false; - return; - } - } - } - } - } - - bool doesPlugInHaveDynamicBuses (bool isInput) const - { - for (int i = 0; i < getBusCount (isInput); ++i) - if (getBusLayoutDetails (isInput, i).canBeDisabled) - return true; - - return false; - } - - bool checkBusFormatsAreNotDiscrete (bool isInput) const - { - const int n = getBusCount (isInput); - const Array& bus = isInput ? processor.busArrangement.inputBuses - : processor.busArrangement.outputBuses; - - for (int busIdx = 0; busIdx < n; ++busIdx) - if (bus.getReference (busIdx).channels.isDiscreteLayout()) - return false; - - return true; - } - - void updateDefaultLayout (bool isInput, int busIdx) - { - BusLayoutDetails& layouts = getBusLayoutDetails (isInput, busIdx); - AudioChannelSet& dfltLayout = layouts.defaultLayout; - - layouts.isEnabledByDefault = (dfltLayout.size() > 0); - - // If you hit this assertion then you are disabling the main bus by default - // which is unsupported - jassert (layouts.isEnabledByDefault || busIdx >= 0); - - if ((! plugInFormatSupportsDiscreteLayouts) && dfltLayout.isDiscreteLayout()) - { - // The default layout is a discrete channel layout, yet some plug-in formats (VST-3) - // do not support this format. We need to find a different default with the same - // number of channels - - dfltLayout = getDefaultLayoutForChannelNumAndBus (isInput, busIdx, dfltLayout.size()); - } - - // are we done? - if (dfltLayout != AudioChannelSet()) - return; - - const bool mainBusHasInputs = hasInputs (0); - const bool mainBusHasOutputs = hasOutputs (0); - - if (busIdx != 0 && (mainBusHasInputs || mainBusHasOutputs)) - { - // the AudioProcessor does not give us any default layout - // for an aux bus. Use the same number of channels as the - // default layout on the main bus as a sensible default for - // the aux bus - - const bool useInput = mainBusHasInputs && mainBusHasOutputs ? isInput : mainBusHasInputs; - dfltLayout = getBusLayoutDetails (useInput, 0).defaultLayout; - - const int numChannels = dfltLayout.size(); - const AudioChannelSet discreteChannelLayout = AudioChannelSet::discreteChannels (numChannels); - - if ((plugInFormatSupportsDiscreteLayouts || dfltLayout != discreteChannelLayout) && - processor.setPreferredBusArrangement (isInput, busIdx, dfltLayout)) - return; - - // no exact match: try at least to match the number of channels - dfltLayout = getDefaultLayoutForChannelNumAndBus (isInput, busIdx, dfltLayout.size()); - if (dfltLayout != AudioChannelSet()) - return; - } - - // check stereo first as this is often the more sensible default than mono - if (processor.setPreferredBusArrangement (isInput, busIdx, (dfltLayout = AudioChannelSet::stereo()))) - return; - - if (plugInFormatSupportsDiscreteLayouts && - processor.setPreferredBusArrangement (isInput, busIdx, (dfltLayout = AudioChannelSet::discreteChannels (2)))) - return; - - // let's guess - for (int numChans = 1; numChans < findMaxNumberOfChannelsForBus (isInput, busIdx); ++numChans) - { - Array sets = layoutListCompatibleWithChannelCount (numChans); - for (int j = 0; j < sets.size(); ++j) - if (processor.setPreferredBusArrangement (isInput, busIdx, (dfltLayout = sets.getReference (j)))) - return; - - if (plugInFormatSupportsDiscreteLayouts && - processor.setPreferredBusArrangement (isInput, busIdx, (dfltLayout = AudioChannelSet::discreteChannels (numChans)))) - return; - } - - // Your bus must support at least a single possible layout - jassertfalse; - } - - void clear (int inputCount, int outputCount) - { - inputLayouts.clear(); - inputLayouts.resize (inputCount); - outputLayouts.clear(); - outputLayouts.resize (outputCount); - } - - //============================================================================== - static Array layoutListCompatibleWithChannelCount (const int channelCount) noexcept - { - jassert (channelCount > 0); - - Array sets; - - switch (channelCount) - { - case 1: - sets.add (AudioChannelSet::mono()); - break; - case 2: - sets.add (AudioChannelSet::stereo()); - break; - case 3: - sets.add (AudioChannelSet::createLCR()); - sets.add (AudioChannelSet::createLRS()); - break; - case 4: - sets.add (AudioChannelSet::createLCRS()); - sets.add (AudioChannelSet::quadraphonic()); - sets.add (AudioChannelSet::ambisonic()); - break; - case 5: - sets.add (AudioChannelSet::pentagonal()); - sets.add (AudioChannelSet::create5point0()); - break; - case 6: - sets.add (AudioChannelSet::hexagonal()); - sets.add (AudioChannelSet::create5point1()); - sets.add (AudioChannelSet::create6point0()); - sets.add (AudioChannelSet::create6point0Music()); - break; - case 7: - sets.add (AudioChannelSet::create6point1()); - sets.add (AudioChannelSet::create7point0()); - break; - case 8: - sets.add (AudioChannelSet::octagonal()); - sets.add (AudioChannelSet::create7point1()); - sets.add (AudioChannelSet::create7point1AC3()); - sets.add (AudioChannelSet::createFront7point1()); - break; - } - - return sets; - } - - JUCE_DECLARE_NON_COPYABLE (PluginBusUtilities) -}; diff --git a/modules/juce_audio_processors/format_types/juce_AU_Shared.h b/modules/juce_audio_processors/format_types/juce_AU_Shared.h new file mode 100644 index 00000000..5ef78578 --- /dev/null +++ b/modules/juce_audio_processors/format_types/juce_AU_Shared.h @@ -0,0 +1,778 @@ +/* + ============================================================================== + + This file is part of the JUCE library. + Copyright (c) 2015 - ROLI Ltd. + + Permission is granted to use this software under the terms of either: + a) the GPL v2 (or any later version) + b) the Affero GPL v3 + + Details of these licenses can be found at: www.gnu.org/licenses + + JUCE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.juce.com for more information. + + ============================================================================== +*/ + +// This macro can be set if you need to override this internal name for some reason.. +#ifndef JUCE_STATE_DICTIONARY_KEY + #define JUCE_STATE_DICTIONARY_KEY "jucePluginState" +#endif + +struct AudioUnitHelpers +{ + // maps a channel index into an AU format to an index of a juce format + struct AUChannelStreamOrder + { + AudioChannelLayoutTag auLayoutTag; + AudioChannelSet::ChannelType speakerOrder[8]; + }; + + struct StreamOrder : public AudioChannelSet + { + static AUChannelStreamOrder auChannelStreamOrder[]; + }; + + static AudioChannelSet::ChannelType CoreAudioChannelLabelToJuceType (AudioChannelLabel label) noexcept + { + if (label >= kAudioChannelLabel_Discrete_0 && label <= kAudioChannelLabel_Discrete_65535) + { + const unsigned int discreteChannelNum = label - kAudioChannelLabel_Discrete_0; + return static_cast (AudioChannelSet::discreteChannel0 + discreteChannelNum); + } + + switch (label) + { + case kAudioChannelLabel_Center: + case kAudioChannelLabel_Mono: return AudioChannelSet::centre; + case kAudioChannelLabel_Left: + case kAudioChannelLabel_HeadphonesLeft: return AudioChannelSet::left; + case kAudioChannelLabel_Right: + case kAudioChannelLabel_HeadphonesRight: return AudioChannelSet::right; + case kAudioChannelLabel_LFEScreen: return AudioChannelSet::LFE; + case kAudioChannelLabel_LeftSurround: return AudioChannelSet::leftSurround; + case kAudioChannelLabel_RightSurround: return AudioChannelSet::rightSurround; + case kAudioChannelLabel_LeftCenter: return AudioChannelSet::leftCentre; + case kAudioChannelLabel_RightCenter: return AudioChannelSet::rightCentre; + case kAudioChannelLabel_CenterSurround: return AudioChannelSet::surround; + case kAudioChannelLabel_LeftSurroundDirect: return AudioChannelSet::leftSurroundSide; + case kAudioChannelLabel_RightSurroundDirect: return AudioChannelSet::rightSurroundSide; + case kAudioChannelLabel_TopCenterSurround: return AudioChannelSet::topMiddle; + case kAudioChannelLabel_VerticalHeightLeft: return AudioChannelSet::topFrontLeft; + case kAudioChannelLabel_VerticalHeightRight: return AudioChannelSet::topFrontRight; + case kAudioChannelLabel_VerticalHeightCenter: return AudioChannelSet::topFrontCentre; + case kAudioChannelLabel_TopBackLeft: return AudioChannelSet::topRearLeft; + case kAudioChannelLabel_RearSurroundLeft: return AudioChannelSet::leftSurroundRear; + case kAudioChannelLabel_TopBackRight: return AudioChannelSet::topRearRight; + case kAudioChannelLabel_RearSurroundRight: return AudioChannelSet::rightSurroundRear; + case kAudioChannelLabel_TopBackCenter: return AudioChannelSet::topRearCentre; + case kAudioChannelLabel_LFE2: return AudioChannelSet::LFE2; + case kAudioChannelLabel_LeftWide: return AudioChannelSet::wideLeft; + case kAudioChannelLabel_RightWide: return AudioChannelSet::wideRight; + case kAudioChannelLabel_Ambisonic_W: return AudioChannelSet::ambisonicW; + case kAudioChannelLabel_Ambisonic_X: return AudioChannelSet::ambisonicX; + case kAudioChannelLabel_Ambisonic_Y: return AudioChannelSet::ambisonicY; + case kAudioChannelLabel_Ambisonic_Z: return AudioChannelSet::ambisonicZ; + default: return AudioChannelSet::unknown; + } + } + + static AudioChannelLabel JuceChannelTypeToCoreAudioLabel (const AudioChannelSet::ChannelType& label) noexcept + { + if (label >= AudioChannelSet::discreteChannel0) + { + const unsigned int discreteChannelNum = label - AudioChannelSet::discreteChannel0;; + return static_cast (kAudioChannelLabel_Discrete_0 + discreteChannelNum); + } + + switch (label) + { + case AudioChannelSet::centre: return kAudioChannelLabel_Center; + case AudioChannelSet::left: return kAudioChannelLabel_Left; + case AudioChannelSet::right: return kAudioChannelLabel_Right; + case AudioChannelSet::LFE: return kAudioChannelLabel_LFEScreen; + case AudioChannelSet::leftSurroundRear: return kAudioChannelLabel_RearSurroundLeft; + case AudioChannelSet::rightSurroundRear: return kAudioChannelLabel_RearSurroundRight; + case AudioChannelSet::leftCentre: return kAudioChannelLabel_LeftCenter; + case AudioChannelSet::rightCentre: return kAudioChannelLabel_RightCenter; + case AudioChannelSet::surround: return kAudioChannelLabel_CenterSurround; + case AudioChannelSet::leftSurround: return kAudioChannelLabel_LeftSurround; + case AudioChannelSet::rightSurround: return kAudioChannelLabel_RightSurround; + case AudioChannelSet::topMiddle: return kAudioChannelLabel_TopCenterSurround; + case AudioChannelSet::topFrontLeft: return kAudioChannelLabel_VerticalHeightLeft; + case AudioChannelSet::topFrontRight: return kAudioChannelLabel_VerticalHeightRight; + case AudioChannelSet::topFrontCentre: return kAudioChannelLabel_VerticalHeightCenter; + case AudioChannelSet::topRearLeft: return kAudioChannelLabel_TopBackLeft; + case AudioChannelSet::topRearRight: return kAudioChannelLabel_TopBackRight; + case AudioChannelSet::topRearCentre: return kAudioChannelLabel_TopBackCenter; + case AudioChannelSet::LFE2: return kAudioChannelLabel_LFE2; + case AudioChannelSet::wideLeft: return kAudioChannelLabel_LeftWide; + case AudioChannelSet::wideRight: return kAudioChannelLabel_RightWide; + case AudioChannelSet::ambisonicW: return kAudioChannelLabel_Ambisonic_W; + case AudioChannelSet::ambisonicX: return kAudioChannelLabel_Ambisonic_X; + case AudioChannelSet::ambisonicY: return kAudioChannelLabel_Ambisonic_Y; + case AudioChannelSet::ambisonicZ: return kAudioChannelLabel_Ambisonic_Z; + case AudioChannelSet::leftSurroundSide: return kAudioChannelLabel_LeftSurroundDirect; + case AudioChannelSet::rightSurroundSide: return kAudioChannelLabel_RightSurroundDirect; + case AudioChannelSet::unknown: return kAudioChannelLabel_Unknown; + case AudioChannelSet::discreteChannel0: return kAudioChannelLabel_Discrete_0; + } + + return kAudioChannelLabel_Unknown; + } + + static AudioChannelSet CoreAudioChannelBitmapToJuceType (UInt32 bitmap) noexcept + { + AudioChannelSet set; + + if ((bitmap & kAudioChannelBit_Left) != 0) set.addChannel (AudioChannelSet::left); + if ((bitmap & kAudioChannelBit_Right) != 0) set.addChannel (AudioChannelSet::right); + if ((bitmap & kAudioChannelBit_Center) != 0) set.addChannel (AudioChannelSet::centre); + if ((bitmap & kAudioChannelBit_LFEScreen) != 0) set.addChannel (AudioChannelSet::LFE); + if ((bitmap & kAudioChannelBit_LeftSurroundDirect) != 0) set.addChannel (AudioChannelSet::leftSurroundSide); + if ((bitmap & kAudioChannelBit_RightSurroundDirect) != 0) set.addChannel (AudioChannelSet::rightSurroundSide); + if ((bitmap & kAudioChannelBit_LeftCenter) != 0) set.addChannel (AudioChannelSet::leftCentre); + if ((bitmap & kAudioChannelBit_RightCenter) != 0) set.addChannel (AudioChannelSet::rightCentre); + if ((bitmap & kAudioChannelBit_CenterSurround) != 0) set.addChannel (AudioChannelSet::surround); + if ((bitmap & kAudioChannelBit_LeftSurround) != 0) set.addChannel (AudioChannelSet::leftSurround); + if ((bitmap & kAudioChannelBit_RightSurround) != 0) set.addChannel (AudioChannelSet::rightSurround); + if ((bitmap & kAudioChannelBit_TopCenterSurround) != 0) set.addChannel (AudioChannelSet::topMiddle); + if ((bitmap & kAudioChannelBit_VerticalHeightLeft) != 0) set.addChannel (AudioChannelSet::topFrontLeft); + if ((bitmap & kAudioChannelBit_VerticalHeightCenter) != 0) set.addChannel (AudioChannelSet::topFrontCentre); + if ((bitmap & kAudioChannelBit_VerticalHeightRight) != 0) set.addChannel (AudioChannelSet::topFrontRight); + if ((bitmap & kAudioChannelBit_TopBackLeft) != 0) set.addChannel (AudioChannelSet::topRearLeft); + if ((bitmap & kAudioChannelBit_TopBackCenter) != 0) set.addChannel (AudioChannelSet::topRearCentre); + if ((bitmap & kAudioChannelBit_TopBackRight) != 0) set.addChannel (AudioChannelSet::topRearRight); + + return set; + } + + static AudioChannelSet CoreAudioChannelLayoutToJuceType (const AudioChannelLayout& layout) noexcept + { + const AudioChannelLayoutTag tag = layout.mChannelLayoutTag; + + if (tag == kAudioChannelLayoutTag_UseChannelBitmap) return CoreAudioChannelBitmapToJuceType (layout.mChannelBitmap); + if (tag == kAudioChannelLayoutTag_UseChannelDescriptions) + { + if (layout.mNumberChannelDescriptions <= 8) + { + // first try to convert the layout via the auChannelStreamOrder array + int layoutIndex; + for (layoutIndex = 0; StreamOrder::auChannelStreamOrder[layoutIndex].auLayoutTag != 0; ++layoutIndex) + { + const AUChannelStreamOrder& streamOrder = StreamOrder::auChannelStreamOrder[layoutIndex]; + + int numChannels; + for (numChannels = 0; numChannels < 8 && streamOrder.speakerOrder[numChannels] != 0;) + ++numChannels; + + if (numChannels != (int) layout.mNumberChannelDescriptions) + continue; + + int ch; + for (ch = 0; ch < numChannels; ++ch) + if (JuceChannelTypeToCoreAudioLabel (streamOrder.speakerOrder[ch]) != layout.mChannelDescriptions[ch].mChannelLabel) + break; + + // match! + if (ch == numChannels) + break; + } + + if (StreamOrder::auChannelStreamOrder[layoutIndex].auLayoutTag != 0) + return CALayoutTagToChannelSet (StreamOrder::auChannelStreamOrder[layoutIndex].auLayoutTag); + } + AudioChannelSet set; + for (unsigned int i = 0; i < layout.mNumberChannelDescriptions; ++i) + set.addChannel (CoreAudioChannelLabelToJuceType (layout.mChannelDescriptions[i].mChannelLabel)); + + return set; + } + + return CALayoutTagToChannelSet (tag); + } + + static AudioChannelSet CALayoutTagToChannelSet (AudioChannelLayoutTag tag) noexcept + { + switch (tag) + { + case kAudioChannelLayoutTag_Unknown: return AudioChannelSet::disabled(); + case kAudioChannelLayoutTag_Mono: return AudioChannelSet::mono(); + case kAudioChannelLayoutTag_Stereo: + case kAudioChannelLayoutTag_StereoHeadphones: + case kAudioChannelLayoutTag_Binaural: return AudioChannelSet::stereo(); + case kAudioChannelLayoutTag_Quadraphonic: return AudioChannelSet::quadraphonic(); + case kAudioChannelLayoutTag_Pentagonal: return AudioChannelSet::pentagonal(); + case kAudioChannelLayoutTag_Hexagonal: return AudioChannelSet::hexagonal(); + case kAudioChannelLayoutTag_Octagonal: return AudioChannelSet::octagonal(); + case kAudioChannelLayoutTag_Ambisonic_B_Format: return AudioChannelSet::ambisonic(); + case kAudioChannelLayoutTag_AudioUnit_6_0: return AudioChannelSet::create6point0(); + case kAudioChannelLayoutTag_DTS_6_0_A: return AudioChannelSet::create6point0Music(); + case kAudioChannelLayoutTag_MPEG_6_1_A: return AudioChannelSet::create6point1(); + case kAudioChannelLayoutTag_DTS_6_1_A: return AudioChannelSet::create6point1Music(); + case kAudioChannelLayoutTag_MPEG_5_0_B: + case kAudioChannelLayoutTag_MPEG_5_0_A: + return AudioChannelSet::create5point0(); + case kAudioChannelLayoutTag_MPEG_5_1_A: return AudioChannelSet::create5point1(); + case kAudioChannelLayoutTag_DTS_7_1: + case kAudioChannelLayoutTag_AudioUnit_7_0: return AudioChannelSet::create7point0(); + case kAudioChannelLayoutTag_AudioUnit_7_0_Front: return AudioChannelSet::create7point0SDDS(); + case kAudioChannelLayoutTag_MPEG_7_1_A: return AudioChannelSet::create7point1SDDS(); + case kAudioChannelLayoutTag_MPEG_3_0_A: + case kAudioChannelLayoutTag_MPEG_3_0_B: return AudioChannelSet::createLCR(); + case kAudioChannelLayoutTag_MPEG_4_0_A: + case kAudioChannelLayoutTag_MPEG_4_0_B: return AudioChannelSet::createLCRS(); + case kAudioChannelLayoutTag_ITU_2_1: return AudioChannelSet::createLRS(); + case kAudioChannelLayoutTag_MPEG_7_1_C: return AudioChannelSet::create7point1(); + } + + if (int numChannels = static_cast (tag) & 0xffff) + return AudioChannelSet::discreteChannels (numChannels); + + // Bitmap and channel description array layout tags are currently unsupported :-( + jassertfalse; + return AudioChannelSet(); + } + + static AudioChannelLayoutTag ChannelSetToCALayoutTag (const AudioChannelSet& set) noexcept + { + if (set == AudioChannelSet::mono()) return kAudioChannelLayoutTag_Mono; + if (set == AudioChannelSet::stereo()) return kAudioChannelLayoutTag_Stereo; + if (set == AudioChannelSet::createLCR()) return kAudioChannelLayoutTag_MPEG_3_0_A; + if (set == AudioChannelSet::createLRS()) return kAudioChannelLayoutTag_ITU_2_1; + if (set == AudioChannelSet::createLCRS()) return kAudioChannelLayoutTag_MPEG_4_0_A; + if (set == AudioChannelSet::quadraphonic()) return kAudioChannelLayoutTag_Quadraphonic; + if (set == AudioChannelSet::pentagonal()) return kAudioChannelLayoutTag_Pentagonal; + if (set == AudioChannelSet::hexagonal()) return kAudioChannelLayoutTag_Hexagonal; + if (set == AudioChannelSet::octagonal()) return kAudioChannelLayoutTag_Octagonal; + if (set == AudioChannelSet::ambisonic()) return kAudioChannelLayoutTag_Ambisonic_B_Format; + if (set == AudioChannelSet::create5point0()) return kAudioChannelLayoutTag_MPEG_5_0_A; + if (set == AudioChannelSet::create5point1()) return kAudioChannelLayoutTag_MPEG_5_1_A; + if (set == AudioChannelSet::create6point0()) return kAudioChannelLayoutTag_AudioUnit_6_0; + if (set == AudioChannelSet::create6point0Music()) return kAudioChannelLayoutTag_DTS_6_0_A; + if (set == AudioChannelSet::create6point1Music()) return kAudioChannelLayoutTag_DTS_6_1_A; + if (set == AudioChannelSet::create6point1()) return kAudioChannelLayoutTag_MPEG_6_1_A; + if (set == AudioChannelSet::create7point0()) return kAudioChannelLayoutTag_AudioUnit_7_0; + if (set == AudioChannelSet::create7point1()) return kAudioChannelLayoutTag_MPEG_7_1_C; + if (set == AudioChannelSet::create7point0SDDS()) return kAudioChannelLayoutTag_AudioUnit_7_0_Front; + if (set == AudioChannelSet::create7point1SDDS()) return kAudioChannelLayoutTag_MPEG_7_1_A; + if (set == AudioChannelSet::disabled()) return kAudioChannelLayoutTag_Unknown; + + return static_cast ((int) kAudioChannelLayoutTag_DiscreteInOrder | set.size()); + } + + static int auChannelIndexToJuce (int auIndex, const AudioChannelSet& channelSet) + { + if (auIndex >= 8) return auIndex; + + AudioChannelLayoutTag currentLayout = ChannelSetToCALayoutTag (channelSet); + + int layoutIndex; + for (layoutIndex = 0; StreamOrder::auChannelStreamOrder[layoutIndex].auLayoutTag != currentLayout; ++layoutIndex) + if (StreamOrder::auChannelStreamOrder[layoutIndex].auLayoutTag == 0) return auIndex; + + AudioChannelSet::ChannelType channelType + = StreamOrder::auChannelStreamOrder[layoutIndex].speakerOrder[auIndex]; + + const int juceIndex = channelSet.getChannelTypes().indexOf (channelType); + + jassert (juceIndex >= 0); + return juceIndex >= 0 ? juceIndex : auIndex; + } + + static int juceChannelIndexToAu (int juceIndex, const AudioChannelSet& channelSet) + { + if (channelSet.isDiscreteLayout()) + return juceIndex; + + AudioChannelLayoutTag currentLayout = ChannelSetToCALayoutTag (channelSet); + + int layoutIndex; + for (layoutIndex = 0; StreamOrder::auChannelStreamOrder[layoutIndex].auLayoutTag != currentLayout; ++layoutIndex) + { + if (StreamOrder::auChannelStreamOrder[layoutIndex].auLayoutTag == 0) + { + jassertfalse; + return juceIndex; + } + } + + const AUChannelStreamOrder& channelOrder = StreamOrder::auChannelStreamOrder[layoutIndex]; + AudioChannelSet::ChannelType channelType = channelSet.getTypeOfChannel (juceIndex); + + for (int i = 0; i < 8 && channelOrder.speakerOrder[i] != 0; ++i) + if (channelOrder.speakerOrder[i] == channelType) + return i; + + jassertfalse; + return juceIndex; + } + + class ChannelRemapper + { + public: + ChannelRemapper (AudioProcessor& p) : processor (p), inputLayoutMap (nullptr), outputLayoutMap (nullptr) {} + ~ChannelRemapper() {} + + void alloc() + { + const int numInputBuses = processor.getBusCount (true); + const int numOutputBuses = processor.getBusCount (false); + + initializeChannelMapArray (true, numInputBuses); + initializeChannelMapArray (false, numOutputBuses); + + for (int busIdx = 0; busIdx < numInputBuses; ++busIdx) + fillLayoutChannelMaps (true, busIdx); + + for (int busIdx = 0; busIdx < numOutputBuses; ++busIdx) + fillLayoutChannelMaps (false, busIdx); + } + + void release() + { + inputLayoutMap = outputLayoutMap = nullptr; + inputLayoutMapPtrStorage.free(); + outputLayoutMapPtrStorage.free(); + inputLayoutMapStorage.free(); + outputLayoutMapStorage.free(); + } + + inline const int* get (bool input, int bus) const noexcept { return (input ? inputLayoutMap : outputLayoutMap) [bus]; } + + private: + //============================================================================== + AudioProcessor& processor; + HeapBlock inputLayoutMapPtrStorage, outputLayoutMapPtrStorage; + HeapBlock inputLayoutMapStorage, outputLayoutMapStorage; + int** inputLayoutMap; + int** outputLayoutMap; + + //============================================================================== + void initializeChannelMapArray (bool isInput, const int numBuses) + { + HeapBlock& layoutMapPtrStorage = isInput ? inputLayoutMapPtrStorage : outputLayoutMapPtrStorage; + HeapBlock& layoutMapStorage = isInput ? inputLayoutMapStorage : outputLayoutMapStorage; + int**& layoutMap = isInput ? inputLayoutMap : outputLayoutMap; + + const int totalInChannels = processor.getTotalNumInputChannels(); + const int totalOutChannels = processor.getTotalNumOutputChannels(); + + layoutMapPtrStorage.calloc (static_cast (numBuses)); + layoutMapStorage.calloc (static_cast (isInput ? totalInChannels : totalOutChannels)); + + layoutMap = layoutMapPtrStorage. getData(); + + int ch = 0; + for (int busIdx = 0; busIdx < numBuses; ++busIdx) + { + layoutMap[busIdx] = layoutMapStorage.getData() + ch; + ch += processor.getChannelCountOfBus (isInput, busIdx); + } + } + + void fillLayoutChannelMaps (bool isInput, int busNr) + { + int* layoutMap = (isInput ? inputLayoutMap : outputLayoutMap)[busNr]; + const AudioChannelSet& channelFormat = processor.getChannelLayoutOfBus (isInput, busNr); + const int numChannels = channelFormat.size(); + + for (int i = 0; i < numChannels; ++i) + layoutMap[i] = AudioUnitHelpers::juceChannelIndexToAu (i, channelFormat); + } + }; + + //============================================================================== + class CoreAudioBufferList + { + public: + CoreAudioBufferList() { reset(); } + + //============================================================================== + void prepare (int inChannels, int outChannels, int maxFrames) + { + const int numChannels = jmax (inChannels, outChannels); + + scratch.setSize (numChannels, maxFrames); + channels.calloc (static_cast (numChannels)); + + reset(); + } + + void release() + { + scratch.setSize (0, 0); + channels.free(); + } + + void reset() noexcept + { + pushIdx = 0; + popIdx = 0; + zeromem (channels.getData(), sizeof(float*) * static_cast (scratch.getNumChannels())); + } + + //============================================================================== + float* setBuffer (const int idx, float* ptr = nullptr) noexcept + { + jassert (idx < scratch.getNumChannels()); + return (channels [idx] = uniqueBuffer (idx, ptr)); + } + + //============================================================================== + float* push() noexcept + { + jassert (pushIdx < scratch.getNumChannels()); + return channels [pushIdx++]; + } + + void push (AudioBufferList& bufferList, const int* channelMap) noexcept + { + jassert (pushIdx < scratch.getNumChannels()); + + if (bufferList.mNumberBuffers > 0) + { + const UInt32 n = bufferList.mBuffers [0].mDataByteSize / + (bufferList.mBuffers [0].mNumberChannels * sizeof (float)); + const bool isInterleaved = isAudioBufferInterleaved (bufferList); + const int numChannels = static_cast (isInterleaved ? bufferList.mBuffers [0].mNumberChannels + : bufferList.mNumberBuffers); + + for (int ch = 0; ch < numChannels; ++ch) + { + float* data = push(); + + int mappedChannel = channelMap [ch]; + if (isInterleaved || static_cast (bufferList.mBuffers [mappedChannel].mData) != data) + copyAudioBuffer (bufferList, mappedChannel, n, data); + } + } + } + + //============================================================================== + float* pop() noexcept + { + jassert (popIdx < scratch.getNumChannels()); + return channels[popIdx++]; + } + + void pop (AudioBufferList& buffer, const int* channelMap) noexcept + { + if (buffer.mNumberBuffers > 0) + { + const UInt32 n = buffer.mBuffers [0].mDataByteSize / (buffer.mBuffers [0].mNumberChannels * sizeof (float)); + const bool isInterleaved = isAudioBufferInterleaved (buffer); + const int numChannels = static_cast (isInterleaved ? buffer.mBuffers [0].mNumberChannels : buffer.mNumberBuffers); + + for (int ch = 0; ch < numChannels; ++ch) + { + int mappedChannel = channelMap [ch]; + float* nextBuffer = pop(); + + if (nextBuffer == buffer.mBuffers [mappedChannel].mData && ! isInterleaved) + continue; // no copying necessary + + if (buffer.mBuffers [mappedChannel].mData == nullptr && ! isInterleaved) + buffer.mBuffers [mappedChannel].mData = nextBuffer; + else + copyAudioBuffer (nextBuffer, mappedChannel, n, buffer); + } + } + } + + //============================================================================== + AudioSampleBuffer& getBuffer (UInt32 frames) noexcept + { + jassert (pushIdx == scratch.getNumChannels()); + + #if JUCE_DEBUG + for (int i = 0; i < pushIdx; ++i) + jassert (channels [i] != nullptr); + #endif + + mutableBuffer.setDataToReferTo (channels, pushIdx, static_cast (frames)); + return mutableBuffer; + } + + private: + float* uniqueBuffer (int idx, float* buffer) noexcept + { + if (buffer == nullptr) + return scratch.getWritePointer (idx); + + for (int ch = 0; ch < idx; ++ch) + if (buffer == channels[ch]) + return scratch.getWritePointer (idx); + + return buffer; + } + + //============================================================================== + AudioSampleBuffer scratch; + AudioSampleBuffer mutableBuffer; + + HeapBlock channels; + int pushIdx, popIdx; + }; + + static bool isAudioBufferInterleaved (const AudioBufferList& audioBuffer) noexcept + { + return (audioBuffer.mNumberBuffers == 1 && audioBuffer.mBuffers[0].mNumberChannels > 1); + } + + static void clearAudioBuffer (const AudioBufferList& audioBuffer) noexcept + { + for (unsigned int ch = 0; ch < audioBuffer.mNumberBuffers; ++ch) + zeromem (audioBuffer.mBuffers[ch].mData, audioBuffer.mBuffers[ch].mDataByteSize); + } + + static void copyAudioBuffer (const AudioBufferList& audioBuffer, const int channel, const UInt32 size, float* dst) noexcept + { + if (! isAudioBufferInterleaved (audioBuffer)) + { + jassert (channel < static_cast (audioBuffer.mNumberBuffers)); + jassert (audioBuffer.mBuffers[channel].mDataByteSize == (size * sizeof (float))); + + memcpy (dst, audioBuffer.mBuffers[channel].mData, size * sizeof (float)); + } + else + { + const int numChannels = static_cast (audioBuffer.mBuffers[0].mNumberChannels); + const UInt32 n = static_cast (numChannels) * size; + const float* src = static_cast (audioBuffer.mBuffers[0].mData); + + jassert (channel < numChannels); + jassert (audioBuffer.mBuffers[0].mDataByteSize == (n * sizeof (float))); + + for (const float* inData = src; inData < (src + n); inData += numChannels) + *dst++ = inData[channel]; + } + } + + static void copyAudioBuffer (const float *src, const int channel, const UInt32 size, AudioBufferList& audioBuffer) noexcept + { + if (! isAudioBufferInterleaved (audioBuffer)) + { + jassert (channel < static_cast (audioBuffer.mNumberBuffers)); + jassert (audioBuffer.mBuffers[channel].mDataByteSize == (size * sizeof (float))); + + memcpy (audioBuffer.mBuffers[channel].mData, src, size * sizeof (float)); + } + else + { + const int numChannels = static_cast (audioBuffer.mBuffers[0].mNumberChannels); + const UInt32 n = static_cast (numChannels) * size; + float* dst = static_cast (audioBuffer.mBuffers[0].mData); + + jassert (channel < numChannels); + jassert (audioBuffer.mBuffers[0].mDataByteSize == (n * sizeof (float))); + + for (float* outData = dst; outData < (dst + n); outData += numChannels) + outData[channel] = *src++; + } + } + + template + static bool isLayoutSupported (const AudioProcessor& processor, + bool isInput, int busIdx, + int numChannels, + const short (&channelLayoutList) [numLayouts][2], + bool hasLayoutMap = true) + { + if (const AudioProcessor::Bus* bus = processor.getBus (isInput, busIdx)) + { + if (! bus->isNumberOfChannelsSupported (numChannels)) + return false; + + if (! hasLayoutMap) + return true; + + const int numConfigs = sizeof (channelLayoutList) / sizeof (short[2]); + + for (int i = 0; i < numConfigs; ++i) + { + if (channelLayoutList[i][isInput ? 0 : 1] == numChannels) + return true; + } + } + + return false; + } + + static Array getAUChannelInfo (const AudioProcessor& processor) + { + Array channelInfo; + + const bool hasMainInputBus = (processor.getBusCount (true) > 0); + const bool hasMainOutputBus = (processor.getBusCount (false) > 0); + + if ((! hasMainInputBus) && (! hasMainOutputBus)) + { + // midi effect plug-in: no audio + AUChannelInfo info; + info.inChannels = 0; + info.outChannels = 0; + + channelInfo.add (info); + return channelInfo; + } + else + { + const uint32_t maxNumChanToCheckFor = 9; + + uint32_t defaultInputs = static_cast (processor.getChannelCountOfBus (true, 0)); + uint32_t defaultOutputs = static_cast (processor.getChannelCountOfBus (false, 0)); + + uint32_t lastInputs = defaultInputs; + uint32_t lastOutputs = defaultOutputs; + + SortedSet supportedChannels; + + // add the current configuration + if (lastInputs != 0 || lastOutputs != 0) + supportedChannels.add ((lastInputs << 16) | lastOutputs); + + for (uint32_t inChanNum = hasMainInputBus ? 1 : 0; inChanNum <= (hasMainInputBus ? maxNumChanToCheckFor : 0); ++inChanNum) + { + const AudioProcessor::Bus* inBus = processor.getBus (true, 0); + + if (inBus != nullptr && (! inBus->isNumberOfChannelsSupported ((int) inChanNum))) + continue; + + for (uint32_t outChanNum = hasMainOutputBus ? 1 : 0; outChanNum <= (hasMainOutputBus ? maxNumChanToCheckFor : 0); ++outChanNum) + { + const AudioProcessor::Bus* outBus = processor.getBus (false, 0); + + if (outBus != nullptr && (! outBus->isNumberOfChannelsSupported ((int) outChanNum))) + continue; + + uint32_t channelConfiguration = (inChanNum << 16) | outChanNum; + + // did we already try this configuration? + if (supportedChannels.contains (channelConfiguration)) continue; + + if (lastInputs != inChanNum && (inChanNum > 0 && inBus != nullptr)) + { + AudioChannelSet set = inBus->supportedLayoutWithChannels ((int) inChanNum); + AudioProcessor::BusesLayout layouts = inBus->getBusesLayoutForLayoutChangeOfBus (set); + + lastInputs = inChanNum; + lastOutputs = hasMainOutputBus ? static_cast (layouts.outputBuses.getReference (0).size()) : 0; + + supportedChannels.add ((lastInputs << 16) | lastOutputs); + } + + if (lastOutputs != outChanNum && (outChanNum > 0 && outBus != nullptr)) + { + AudioChannelSet set = outBus->supportedLayoutWithChannels ((int) outChanNum); + AudioProcessor::BusesLayout layouts = outBus->getBusesLayoutForLayoutChangeOfBus (set); + + lastOutputs = outChanNum; + lastInputs = hasMainInputBus ? static_cast (layouts.inputBuses.getReference (0).size()) : 0; + + supportedChannels.add ((lastInputs << 16) | lastOutputs); + } + } + } + + bool hasInOutMismatch = false; + for (int i = 0; i < supportedChannels.size(); ++i) + { + const uint32_t numInputs = (supportedChannels[i] >> 16) & 0xffff; + const uint32_t numOutputs = (supportedChannels[i] >> 0) & 0xffff; + + if (numInputs != numOutputs) + { + hasInOutMismatch = true; + break; + } + } + + bool hasUnsupportedInput = ! hasMainOutputBus, hasUnsupportedOutput = ! hasMainInputBus; + for (uint32_t inChanNum = hasMainInputBus ? 1 : 0; inChanNum <= (hasMainInputBus ? maxNumChanToCheckFor : 0); ++inChanNum) + { + uint32_t channelConfiguration = (inChanNum << 16) | (hasInOutMismatch ? defaultOutputs : inChanNum); + if (! supportedChannels.contains (channelConfiguration)) + { + hasUnsupportedInput = true; + break; + } + } + + for (uint32_t outChanNum = hasMainOutputBus ? 1 : 0; outChanNum <= (hasMainOutputBus ? maxNumChanToCheckFor : 0); ++outChanNum) + { + uint32_t channelConfiguration = ((hasInOutMismatch ? defaultInputs : outChanNum) << 16) | outChanNum; + if (! supportedChannels.contains (channelConfiguration)) + { + hasUnsupportedOutput = true; + break; + } + } + + for (int i = 0; i < supportedChannels.size(); ++i) + { + const int numInputs = (supportedChannels[i] >> 16) & 0xffff; + const int numOutputs = (supportedChannels[i] >> 0) & 0xffff; + + AUChannelInfo info; + + // see here: https://developer.apple.com/library/mac/documentation/MusicAudio/Conceptual/AudioUnitProgrammingGuide/TheAudioUnit/TheAudioUnit.html + info.inChannels = static_cast (hasMainInputBus ? (hasUnsupportedInput ? numInputs : (hasInOutMismatch && (! hasUnsupportedOutput) ? -2 : -1)) : 0); + info.outChannels = static_cast (hasMainOutputBus ? (hasUnsupportedOutput ? numOutputs : (hasInOutMismatch && (! hasUnsupportedInput) ? -2 : -1)) : 0); + + if (info.inChannels == -2 && info.outChannels == -2) + info.inChannels = -1; + + int j; + for (j = 0; j < channelInfo.size(); ++j) + if (channelInfo[j].inChannels == info.inChannels && channelInfo[j].outChannels == info.outChannels) + break; + + if (j >= channelInfo.size()) + channelInfo.add (info); + } + } + + return channelInfo; + } +}; + +AudioUnitHelpers::AUChannelStreamOrder AudioUnitHelpers::StreamOrder::auChannelStreamOrder[] = +{ + {kAudioChannelLayoutTag_Mono, {centre, unknown, unknown, unknown, unknown, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_Stereo, {left, right, unknown, unknown, unknown, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_StereoHeadphones, {left, right, unknown, unknown, unknown, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_Binaural, {left, right, unknown, unknown, unknown, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_Quadraphonic, {left, right, leftSurround, rightSurround, unknown, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_Pentagonal, {left, right, leftSurroundRear, rightSurroundRear, centre, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_Hexagonal, {left, right, leftSurroundRear, rightSurroundRear, centre, centreSurround, unknown, unknown}}, + {kAudioChannelLayoutTag_Octagonal, {left, right, leftSurround, rightSurround, centre, centreSurround, wideLeft, wideRight}}, + {kAudioChannelLayoutTag_Ambisonic_B_Format, {ambisonicW, ambisonicX, ambisonicY, ambisonicZ, unknown, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_MPEG_5_0_A, {left, right, centre, leftSurround, rightSurround, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_MPEG_5_0_B, {left, right, leftSurround, rightSurround, centre, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_MPEG_5_1_A, {left, right, centre, LFE, leftSurround, rightSurround, unknown, unknown}}, + {kAudioChannelLayoutTag_AudioUnit_6_0, {left, right, leftSurround, rightSurround, centre, centreSurround, unknown, unknown}}, + {kAudioChannelLayoutTag_DTS_6_0_A, {left, right, leftSurround, rightSurround, leftSurroundSide, rightSurroundSide, unknown, unknown}}, // TODO check this one + {kAudioChannelLayoutTag_MPEG_6_1_A, {left, right, centre, LFE, leftSurround, rightSurround, centre, unknown}}, + {kAudioChannelLayoutTag_DTS_6_1_A, {leftSurroundSide, rightSurroundSide, left, right, leftSurround, rightSurround, LFE, unknown}}, + {kAudioChannelLayoutTag_AudioUnit_7_0, {left, right, leftSurroundSide, rightSurroundSide, centre, leftSurroundRear, rightSurroundRear, unknown}}, + {kAudioChannelLayoutTag_MPEG_7_1_C, {left, right, centre, LFE, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear}}, + {kAudioChannelLayoutTag_AudioUnit_7_0_Front,{left, right, leftSurround, rightSurround, centre, leftCentre, rightCentre, unknown}}, + {kAudioChannelLayoutTag_MPEG_7_1_A, {left, right, centre, LFE, leftSurround, rightSurround, leftCentre, rightCentre}}, + {kAudioChannelLayoutTag_DTS_7_1, {leftCentre, centre, rightCentre, left, right, leftSurround, rightSurround, LFE}}, + {kAudioChannelLayoutTag_MPEG_3_0_A, {left, right, centre, unknown, unknown, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_MPEG_3_0_B, {centre, left, right, unknown, unknown, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_MPEG_4_0_A, {left, right, centre, centreSurround, unknown, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_MPEG_4_0_B, {centre, left, right, centreSurround, unknown, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_ITU_2_1, {left, right, centreSurround, unknown, unknown, unknown, unknown, unknown}}, + {kAudioChannelLayoutTag_EAC3_7_1_C, {left, centre, right, leftSurround, rightSurround, LFE, leftSurroundSide, rightSurroundSide}}, + {unknown, {unknown,unknown,unknown,unknown,unknown,unknown,unknown,unknown}} +}; diff --git a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm index 14d1964e..6fcd0103 100644 --- a/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm +++ b/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm @@ -64,6 +64,8 @@ namespace juce #include "../../juce_core/native/juce_osx_ObjCHelpers.h" +#include "juce_AU_Shared.h" + // Change this to disable logging of various activities #ifndef AU_LOGGING #define AU_LOGGING 1 @@ -118,6 +120,8 @@ namespace AudioUnitFormatHelpers s << "Generators/"; else if (desc.componentType == kAudioUnitType_Panner) s << "Panners/"; + else if (desc.componentType == kAudioUnitType_Mixer) + s << "Mixers/"; s << osTypeToString (desc.componentType) << "," << osTypeToString (desc.componentSubType) << "," @@ -249,7 +253,8 @@ namespace AudioUnitFormatHelpers || types[0] == kAudioUnitType_MusicEffect || types[0] == kAudioUnitType_Effect || types[0] == kAudioUnitType_Generator - || types[0] == kAudioUnitType_Panner) + || types[0] == kAudioUnitType_Panner + || types[0] == kAudioUnitType_Mixer) { desc.componentType = types[0]; desc.componentSubType = types[1]; @@ -284,6 +289,7 @@ namespace AudioUnitFormatHelpers case kAudioUnitType_MusicDevice: return "Synth"; case kAudioUnitType_Generator: return "Generator"; case kAudioUnitType_Panner: return "Panner"; + case kAudioUnitType_Mixer: return "Mixer"; default: break; } @@ -300,17 +306,14 @@ class AudioUnitPluginInstance : public AudioPluginInstance { public: AudioUnitPluginInstance (AudioComponentInstance au) - : auComponent (AudioComponentInstanceGetComponent (au)), + : AudioPluginInstance (getBusesProperties (au)), + auComponent (AudioComponentInstanceGetComponent (au)), wantsMidiMessages (false), producesMidiMessages (false), wasPlaying (false), prepared (false), isAUv3 (false), currentBuffer (nullptr), - numInputBusChannels (0), - numOutputBusChannels (0), - numInputBusses (0), - numOutputBusses (0), audioUnit (au), #if JUCE_MAC eventListenerRef (0), @@ -330,6 +333,7 @@ public: AudioComponentDescription ignore; getComponentDescFromIdentifier (createPluginIdentifier (componentDesc), ignore, pluginName, version, manufacturer); + updateSupportedLayouts(); } ~AudioUnitPluginInstance() @@ -393,14 +397,241 @@ public: bool initialise (double rate, int blockSize) { - updateNumChannels(); producesMidiMessages = canProduceMidiOutput(); - setPlayConfigDetails ((int) (numInputBusChannels * numInputBusses), - (int) (numOutputBusChannels * numOutputBusses), - rate, blockSize); + setRateAndBufferSizeDetails (rate, blockSize); setLatencySamples (0); refreshParameterList(); - setPluginCallbacks(); + createPluginCallbacks(); + + return true; + } + + //============================================================================== + bool canAddBus (bool isInput) const override { return isBusCountWritable (isInput); } + bool canRemoveBus (bool isInput) const override { return isBusCountWritable (isInput); } + + bool canApplyBusCountChange (bool isInput, bool isAdding, BusProperties& outProperties) override + { + int currentCount = getBusCount (isInput); + int newCount = currentCount + (isAdding ? 1 : -1); + AudioUnitScope scope = isInput ? kAudioUnitScope_Input : kAudioUnitScope_Output; + + if (AudioUnitSetProperty (audioUnit, kAudioUnitProperty_ElementCount, scope, 0, &newCount, sizeof (newCount)) == noErr) + { + getBusProperties (isInput, currentCount, outProperties.busName, outProperties.defaultLayout); + outProperties.isActivatedByDefault = true; + updateSupportedLayouts(); + + return true; + } + + return false; + } + + //============================================================================== + bool isBusesLayoutSupported (const BusesLayout& layouts) const override + { + if (layouts == getBusesLayout()) + return true; + + for (int dir = 0; dir < 2; ++dir) + { + const bool isInput = (dir == 0); + const Array& requestedLayouts = (isInput ? layouts.inputBuses : layouts.outputBuses); + const Array& oppositeRequestedLayouts = (isInput ? layouts.outputBuses : layouts.inputBuses); + const Array >& supported = (isInput ? supportedInLayouts : supportedOutLayouts); + const int n = getBusCount (isInput); + + for (int busIdx = 0; busIdx < n; ++busIdx) + { + const AudioChannelSet& requested = requestedLayouts.getReference (busIdx); + const int oppositeBusIdx = jmin (getBusCount (! isInput) - 1, busIdx); + const bool hasOppositeBus = (oppositeBusIdx >= 0); + const AudioChannelSet oppositeRequested = (hasOppositeBus ? oppositeRequestedLayouts.getReference (oppositeBusIdx) : AudioChannelSet()); + const Array& possible = supported.getReference (busIdx); + + if (requested.isDisabled()) + return false; + + if (possible.size() > 0 && ! possible.contains (requested)) + return false; + + int i; + for (i = 0; i < numChannelInfos; ++i) + { + const AUChannelInfo& info = channelInfos[i]; + const SInt16& thisChannels = (isInput ? info.inChannels : info.outChannels); + const SInt16& opChannels = (isInput ? info.outChannels : info.inChannels); + + // this bus + if (thisChannels == 0) continue; + else if (thisChannels > 0 && requested.size() != thisChannels) continue; + else if (thisChannels < -2 && requested.size() > (thisChannels * -1)) continue; + + // opposite bus + if (opChannels == 0 && hasOppositeBus) continue; + else if (opChannels > 0 && oppositeRequested.size() != opChannels) continue; + else if (opChannels < -2 && oppositeRequested.size() > (opChannels * -1)) continue; + + // both buses + if (thisChannels == -2 && opChannels == -2) continue; + if (thisChannels == -1 && opChannels == -1) + { + int numOppositeBuses = getBusCount (! isInput); + int j; + for (j = 0; j < numOppositeBuses; ++j) + if (requested.size() != oppositeRequestedLayouts.getReference (j).size()) + break; + + if (j < numOppositeBuses) continue; + } + + break; + } + + if (i >= numChannelInfos) + return false; + } + } + + return true; + } + + bool syncBusLayouts (const BusesLayout& layouts, bool isInitialized, bool& layoutHasChanged) const + { + layoutHasChanged = false; + + for (int dir = 0; dir < 2; ++dir) + { + const bool isInput = (dir == 0); + const AudioUnitScope scope = isInput ? kAudioUnitScope_Input : kAudioUnitScope_Output; + const int n = getBusCount (isInput); + + if (getElementCount (scope) != n && isBusCountWritable (isInput)) + { + OSStatus err; + UInt32 newCount = static_cast (n); + layoutHasChanged = true; + + err = AudioUnitSetProperty (audioUnit, kAudioUnitProperty_ElementCount, scope, 0, &newCount, sizeof (newCount)); + jassert (err == noErr); + } + + for (int i = 0; i < n; ++i) + { + Float64 sampleRate; + UInt32 sampleRateSize = sizeof (sampleRate); + + AudioUnitGetProperty (audioUnit, kAudioUnitProperty_SampleRate, scope, static_cast (i), &sampleRate, &sampleRateSize); + + const AudioChannelSet& set = layouts.getChannelSet (isInput, i); + const int requestedNumChannels = set.size(); + + { + AudioStreamBasicDescription stream; + UInt32 dataSize = sizeof (stream); + OSStatus err = AudioUnitGetProperty (audioUnit, kAudioUnitProperty_StreamFormat, scope, static_cast (i), &stream, &dataSize); + if (err != noErr || dataSize < sizeof (stream)) + return false; + + const int actualNumChannels = static_cast (stream.mChannelsPerFrame); + + if (actualNumChannels != requestedNumChannels) + { + layoutHasChanged = true; + zerostruct (stream); // (can't use "= { 0 }" on this object because it's typedef'ed as a C struct) + stream.mSampleRate = sampleRate; + stream.mFormatID = kAudioFormatLinearPCM; + stream.mFormatFlags = kAudioFormatFlagsNativeFloatPacked | kAudioFormatFlagIsNonInterleaved | kAudioFormatFlagsNativeEndian; + stream.mFramesPerPacket = 1; + stream.mBytesPerPacket = 4; + stream.mBytesPerFrame = 4; + stream.mBitsPerChannel = 32; + stream.mChannelsPerFrame = static_cast (requestedNumChannels); + + err = AudioUnitSetProperty (audioUnit, kAudioUnitProperty_StreamFormat, scope, static_cast (i), &stream, sizeof (stream)); + if (err != noErr) return false; + } + } + + if (! set.isDiscreteLayout()) + { + const AudioChannelLayoutTag requestedTag = AudioUnitHelpers::ChannelSetToCALayoutTag (set); + + AudioChannelLayout layout; + const UInt32 minDataSize = sizeof (layout) - sizeof (AudioChannelDescription); + UInt32 dataSize = minDataSize; + + AudioChannelLayoutTag actualTag = kAudioChannelLayoutTag_Unknown; + OSStatus err = AudioUnitGetProperty (audioUnit, kAudioUnitProperty_AudioChannelLayout, scope, static_cast (i), &layout, &dataSize); + bool supportsLayouts = (err == noErr && dataSize >= minDataSize); + + if (supportsLayouts) + { + const UInt32 expectedSize = + minDataSize + (sizeof (AudioChannelDescription) * layout.mNumberChannelDescriptions); + + HeapBlock layoutBuffer; + layoutBuffer.malloc (1, expectedSize); + dataSize = expectedSize; + + err = AudioUnitGetProperty (audioUnit, kAudioUnitProperty_AudioChannelLayout, scope, + static_cast (i), layoutBuffer.getData(), &dataSize); + + if (err != noErr || dataSize < expectedSize) + return false; + + actualTag = AudioUnitHelpers::ChannelSetToCALayoutTag (AudioUnitHelpers::CoreAudioChannelLayoutToJuceType (layout)); + } + + if (actualTag != requestedTag) + { + zerostruct (layout); + layout.mChannelLayoutTag = requestedTag; + + err = AudioUnitSetProperty (audioUnit, kAudioUnitProperty_AudioChannelLayout, scope, static_cast (i), &layout, minDataSize); + + // only bail out if the plug-in claims to support layouts + // See AudioUnit headers on kAudioUnitProperty_AudioChannelLayout + if (err != noErr && supportsLayouts && isInitialized) + return false; + } + } + } + } + + return true; + } + + bool canApplyBusesLayout (const BusesLayout& layouts) const override + { + // You cannot call setBusesLayout when the AudioProcessor is processing. + // Call releaseResources first! + jassert (! prepared); + + bool layoutHasChanged = false; + + if (! syncBusLayouts (layouts, false, layoutHasChanged)) + return false; + + // did anything actually change + if (layoutHasChanged) + { + bool success = (AudioUnitInitialize (audioUnit) == noErr); + + // Some plug-ins require the LayoutTag to be set after initialization + if (success) + success = syncBusLayouts (layouts, true, layoutHasChanged); + + AudioUnitUninitialize (audioUnit); + + if (! success) + // make sure that the layout is back to it's original state + syncBusLayouts (getBusesLayout(), false, layoutHasChanged); + + return success; + } + return true; } @@ -452,76 +683,75 @@ public: if (audioUnit != nullptr) { releaseResources(); - updateNumChannels(); - - Float64 sampleRateIn = 0, sampleRateOut = 0; - UInt32 sampleRateSize = sizeof (sampleRateIn); - const Float64 sr = newSampleRate; - for (AudioUnitElement i = 0; i < numInputBusses; ++i) + for (int dir = 0; dir < 2; ++dir) { - AudioUnitGetProperty (audioUnit, kAudioUnitProperty_SampleRate, kAudioUnitScope_Input, i, &sampleRateIn, &sampleRateSize); + const bool isInput = (dir == 0); + const AudioUnitScope scope = isInput ? kAudioUnitScope_Input : kAudioUnitScope_Output; + const int n = getBusCount (isInput); - if (sampleRateIn != sr) - AudioUnitSetProperty (audioUnit, kAudioUnitProperty_SampleRate, kAudioUnitScope_Input, i, &sr, sizeof (sr)); - } + for (int i = 0; i < n; ++i) + { + Float64 sampleRate; + UInt32 sampleRateSize = sizeof (sampleRate); + const Float64 sr = newSampleRate; - for (AudioUnitElement i = 0; i < numOutputBusses; ++i) - { - AudioUnitGetProperty (audioUnit, kAudioUnitProperty_SampleRate, kAudioUnitScope_Output, i, &sampleRateOut, &sampleRateSize); + AudioUnitGetProperty (audioUnit, kAudioUnitProperty_SampleRate, scope, static_cast (i), &sampleRate, &sampleRateSize); + + if (sampleRate != sr) + AudioUnitSetProperty (audioUnit, kAudioUnitProperty_SampleRate, scope, static_cast (i), &sr, sizeof (sr)); + + if (isInput) + { + AURenderCallbackStruct info; + zerostruct (info); // (can't use "= { 0 }" on this object because it's typedef'ed as a C struct) - if (sampleRateOut != sr) - AudioUnitSetProperty (audioUnit, kAudioUnitProperty_SampleRate, kAudioUnitScope_Output, i, &sr, sizeof (sr)); + info.inputProcRefCon = this; + info.inputProc = renderGetInputCallback; + + AudioUnitSetProperty (audioUnit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, + static_cast (i), &info, sizeof (info)); + } + else + { + outputBufferList.add (new AUBuffer (static_cast (getChannelCountOfBus (false, i)))); + } + } } UInt32 frameSize = (UInt32) estimatedSamplesPerBlock; AudioUnitSetProperty (audioUnit, kAudioUnitProperty_MaximumFramesPerSlice, kAudioUnitScope_Global, 0, &frameSize, sizeof (frameSize)); - setPlayConfigDetails ((int) (numInputBusChannels * numInputBusses), - (int) (numOutputBusChannels * numOutputBusses), - (double) newSampleRate, estimatedSamplesPerBlock); + setRateAndBufferSizeDetails ((double) newSampleRate, estimatedSamplesPerBlock); updateLatency(); - { - AudioStreamBasicDescription stream; - zerostruct (stream); // (can't use "= { 0 }" on this object because it's typedef'ed as a C struct) - stream.mSampleRate = sr; - stream.mFormatID = kAudioFormatLinearPCM; - stream.mFormatFlags = kAudioFormatFlagsNativeFloatPacked | kAudioFormatFlagIsNonInterleaved | kAudioFormatFlagsNativeEndian; - stream.mFramesPerPacket = 1; - stream.mBytesPerPacket = 4; - stream.mBytesPerFrame = 4; - stream.mBitsPerChannel = 32; - stream.mChannelsPerFrame = numInputBusChannels; - - for (AudioUnitElement i = 0; i < numInputBusses; ++i) - AudioUnitSetProperty (audioUnit, kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Input, i, &stream, sizeof (stream)); - - stream.mChannelsPerFrame = numOutputBusChannels; - - for (AudioUnitElement i = 0; i < numOutputBusses; ++i) - AudioUnitSetProperty (audioUnit, kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Output, i, &stream, sizeof (stream)); - } - - if (numOutputBusses != 0 && numOutputBusChannels != 0) - outputBufferList.calloc (numOutputBusses, getAudioBufferSizeInBytes()); - zerostruct (timeStamp); timeStamp.mSampleTime = 0; - timeStamp.mHostTime = GetCurrentHostTime (0, sr, isAUv3); + timeStamp.mHostTime = GetCurrentHostTime (0, newSampleRate, isAUv3); timeStamp.mFlags = kAudioTimeStampSampleTimeValid | kAudioTimeStampHostTimeValid; currentBuffer = nullptr; wasPlaying = false; - resetBusses(); + resetBuses(); + + bool ignore; + + if (! syncBusLayouts (getBusesLayout(), false, ignore)) + return; - jassert (! prepared); prepared = (AudioUnitInitialize (audioUnit) == noErr); + + if (prepared) + { + if (! syncBusLayouts (getBusesLayout(), true, ignore)) + { + prepared = false; + AudioUnitUninitialize (audioUnit); + } + } } } @@ -530,10 +760,10 @@ public: if (prepared) { AudioUnitUninitialize (audioUnit); - resetBusses(); + resetBuses(); AudioUnitReset (audioUnit, kAudioUnitScope_Global, 0); - outputBufferList.free(); + outputBufferList.clear(); currentBuffer = nullptr; prepared = false; } @@ -541,10 +771,10 @@ public: incomingMidi.clear(); } - void resetBusses() + void resetBuses() { - for (AudioUnitElement i = 0; i < numInputBusses; ++i) AudioUnitReset (audioUnit, kAudioUnitScope_Input, i); - for (AudioUnitElement i = 0; i < numOutputBusses; ++i) AudioUnitReset (audioUnit, kAudioUnitScope_Output, i); + for (int i = 0; i < getBusCount (true); ++i) AudioUnitReset (audioUnit, kAudioUnitScope_Input, static_cast (i)); + for (int i = 0; i < getBusCount (false); ++i) AudioUnitReset (audioUnit, kAudioUnitScope_Output, static_cast (i)); } void processBlock (AudioSampleBuffer& buffer, MidiBuffer& midiMessages) override @@ -555,17 +785,19 @@ public: { timeStamp.mHostTime = GetCurrentHostTime (numSamples, getSampleRate(), isAUv3); - for (AudioUnitElement i = 0; i < numOutputBusses; ++i) + int chIdx = 0; + const int numOutputBuses = getBusCount (false); + for (int i = 0; i < numOutputBuses; ++i) { - if (AudioBufferList* const abl = getAudioBufferListForBus(i)) + if (AUBuffer* buf = outputBufferList[i]) { - abl->mNumberBuffers = numOutputBusChannels; + AudioBufferList& abl = *buf; - for (AudioUnitElement j = 0; j < numOutputBusChannels; ++j) + for (AudioUnitElement j = 0; j < abl.mNumberBuffers; ++j) { - abl->mBuffers[j].mNumberChannels = 1; - abl->mBuffers[j].mDataByteSize = (UInt32) (sizeof (float) * (size_t) numSamples); - abl->mBuffers[j].mData = buffer.getWritePointer ((int) (i * numOutputBusChannels + j)); + abl.mBuffers[j].mNumberChannels = 1; + abl.mBuffers[j].mDataByteSize = (UInt32) (sizeof (float) * (size_t) numSamples); + abl.mBuffers[j].mData = buffer.getWritePointer (chIdx++); } } } @@ -591,10 +823,12 @@ public: } - for (AudioUnitElement i = 0; i < numOutputBusses; ++i) + for (int i = 0; i < numOutputBuses; ++i) { AudioUnitRenderActionFlags flags = 0; - AudioUnitRender (audioUnit, &flags, &timeStamp, i, (UInt32) numSamples, getAudioBufferListForBus (i)); + + if (AUBuffer* buf = outputBufferList[i]) + AudioUnitRender (audioUnit, &flags, &timeStamp, static_cast (i), (UInt32) numSamples, buf->bufferList.getData()); } timeStamp.mSampleTime += numSamples; @@ -618,6 +852,30 @@ public: bool hasEditor() const override { return true; } AudioProcessorEditor* createEditor() override; + static AudioProcessor::BusesProperties getBusesProperties (AudioComponentInstance comp) + { + AudioProcessor::BusesProperties busProperties; + + for (int dir = 0; dir < 2; ++dir) + { + const bool isInput = (dir == 0); + const int n = getElementCount (comp, isInput ? kAudioUnitScope_Input : kAudioUnitScope_Output); + + for (int i = 0; i < n; ++i) + { + String busName; + AudioChannelSet currentLayout; + + getBusProperties (comp, isInput, i, busName, currentLayout); + jassert (! currentLayout.isDisabled()); + + busProperties.addBus (isInput, busName, currentLayout, true); + } + } + + return busProperties; + } + //============================================================================== const String getInputChannelName (int index) const override { @@ -948,10 +1206,31 @@ private: CriticalSection lock; bool wantsMidiMessages, producesMidiMessages, wasPlaying, prepared, isAUv3; - HeapBlock outputBufferList; + struct AUBuffer + { + AUBuffer (size_t numBuffers) + { + bufferList.calloc (1, (sizeof (AudioBufferList) - sizeof (::AudioBuffer)) + (sizeof (::AudioBuffer) * numBuffers)); + AudioBufferList& buffer = *bufferList.getData(); + + buffer.mNumberBuffers = static_cast (numBuffers); + } + + operator AudioBufferList&() + { + return *bufferList.getData(); + } + + HeapBlock bufferList; + }; + + OwnedArray outputBufferList; AudioTimeStamp timeStamp; AudioSampleBuffer* currentBuffer; - AudioUnitElement numInputBusChannels, numOutputBusChannels, numInputBusses, numOutputBusses; + Array > supportedInLayouts, supportedOutLayouts; + + int numChannelInfos; + HeapBlock channelInfos; AudioUnit audioUnit; #if JUCE_MAC @@ -972,22 +1251,10 @@ private: CriticalSection midiInLock; MidiBuffer incomingMidi; - void setPluginCallbacks() + void createPluginCallbacks() { if (audioUnit != nullptr) { - { - AURenderCallbackStruct info; - zerostruct (info); // (can't use "= { 0 }" on this object because it's typedef'ed as a C struct) - - info.inputProcRefCon = this; - info.inputProc = renderGetInputCallback; - - for (AudioUnitElement i = 0; i < numInputBusses; ++i) - AudioUnitSetProperty (audioUnit, kAudioUnitProperty_SetRenderCallback, - kAudioUnitScope_Input, i, &info, sizeof (info)); - } - #if JUCE_MAC if (producesMidiMessages) { @@ -1124,15 +1391,17 @@ private: { // if this ever happens, might need to add extra handling jassert (inNumberFrames == (UInt32) currentBuffer->getNumSamples()); + AudioSampleBuffer buffer = + (static_cast (inBusNumber) < getBusCount (true) + ? getBusBuffer (*currentBuffer, true, static_cast (inBusNumber)) + : AudioSampleBuffer()); - for (UInt32 i = 0; i < ioData->mNumberBuffers; ++i) + for (int i = 0; i < static_cast (ioData->mNumberBuffers); ++i) { - const int bufferChannel = (int) (inBusNumber * numInputBusChannels + i); - - if (bufferChannel < currentBuffer->getNumChannels()) + if (i < buffer.getNumChannels()) { memcpy (ioData->mBuffers[i].mData, - currentBuffer->getReadPointer (bufferChannel), + buffer.getReadPointer (i), sizeof (float) * inNumberFrames); } else @@ -1308,87 +1577,172 @@ private: return currentTime; } - size_t getAudioBufferSizeInBytes() const noexcept + bool isBusCountWritable (bool isInput) const noexcept { - return offsetof (AudioBufferList, mBuffers) + (sizeof (::AudioBuffer) * numOutputBusChannels); + UInt32 countSize; + Boolean writable; + OSStatus err; + AudioUnitScope scope = (isInput ? kAudioUnitScope_Input : kAudioUnitScope_Output); + + err = AudioUnitGetPropertyInfo (audioUnit, kAudioUnitProperty_ElementCount, scope, 0, &countSize, &writable); + + return (err == noErr && writable != 0 && countSize == sizeof (UInt32)); } - AudioBufferList* getAudioBufferListForBus (AudioUnitElement busIndex) const noexcept + //============================================================================== + int getElementCount (AudioUnitScope scope) const noexcept { - return addBytesToPointer (outputBufferList.getData(), getAudioBufferSizeInBytes() * busIndex); + return static_cast (getElementCount (audioUnit, scope)); } - AudioUnitElement getElementCount (AudioUnitScope scope) const noexcept + static int getElementCount (AudioUnit comp, AudioUnitScope scope) noexcept { UInt32 count; UInt32 countSize = sizeof (count); - if (AudioUnitGetProperty (audioUnit, kAudioUnitProperty_ElementCount, scope, 0, &count, &countSize) != noErr - || countSize == 0) - count = 1; + OSStatus err = AudioUnitGetProperty (comp, kAudioUnitProperty_ElementCount, scope, 0, &count, &countSize); + jassert (err == noErr); + ignoreUnused (err); - return count; + return static_cast (count); } - void updateNumChannels() + //============================================================================== + void getBusProperties (bool isInput, int busIdx, String& busName, AudioChannelSet& currentLayout) const { - numInputBusses = getElementCount (kAudioUnitScope_Input); - numOutputBusses = getElementCount (kAudioUnitScope_Output); + getBusProperties (audioUnit, isInput, busIdx, busName, currentLayout); + } - AUChannelInfo supportedChannels [128]; - UInt32 supportedChannelsSize = 0; - Boolean writable; + static void getBusProperties (AudioUnit comp, bool isInput, int busIdx, String& busName, AudioChannelSet& currentLayout) + { + const AudioUnitScope scope = isInput ? kAudioUnitScope_Input : kAudioUnitScope_Output; + busName = (isInput ? "Input #" : "Output #") + String (busIdx + 1); - if (AudioUnitGetPropertyInfo (audioUnit, kAudioUnitProperty_SupportedNumChannels, kAudioUnitScope_Global, - 0, &supportedChannelsSize, &writable) == noErr - && supportedChannelsSize > 0 - && AudioUnitGetProperty (audioUnit, kAudioUnitProperty_SupportedNumChannels, kAudioUnitScope_Global, - 0, supportedChannels, &supportedChannelsSize) == noErr) { - int explicitNumIns = 0; - int explicitNumOuts = 0; - int maximumNumIns = 0; - int maximumNumOuts = 0; + CFStringRef busNameCF = nullptr; + UInt32 propertySize = sizeof (busNameCF); - for (int i = 0; i < (int) (supportedChannelsSize / sizeof (AUChannelInfo)); ++i) + if (AudioUnitGetProperty (comp, kAudioUnitProperty_ElementName, scope, static_cast (busIdx), &busNameCF, &propertySize) == noErr + && busNameCF != nullptr) { - const int inChannels = (int) supportedChannels[i].inChannels; - const int outChannels = (int) supportedChannels[i].outChannels; + busName = nsStringToJuce ((NSString*) busNameCF); + CFRelease (busNameCF); + } - if (inChannels < 0) - maximumNumIns = jmin (maximumNumIns, inChannels); - else - explicitNumIns = jmax (explicitNumIns, inChannels); + { + AudioChannelLayout auLayout; + propertySize = sizeof (auLayout); - if (outChannels < 0) - maximumNumOuts = jmin (maximumNumOuts, outChannels); - else - explicitNumOuts = jmax (explicitNumOuts, outChannels); + if (AudioUnitGetProperty (comp, kAudioUnitProperty_AudioChannelLayout, scope, static_cast (busIdx), &auLayout, &propertySize) == noErr) + currentLayout = AudioUnitHelpers::CoreAudioChannelLayoutToJuceType (auLayout); } - if ((maximumNumIns == -1 && maximumNumOuts == -1) // (special meaning: any number of ins/outs, as long as they match) - || (maximumNumIns == -2 && maximumNumOuts == -1) // (special meaning: any number of ins/outs, even if they don't match) - || (maximumNumIns == -1 && maximumNumOuts == -2)) + if (currentLayout.isDisabled()) { - numInputBusChannels = numOutputBusChannels = 2; + AudioStreamBasicDescription descr; + propertySize = sizeof (descr); + + if (AudioUnitGetProperty (comp, kAudioUnitProperty_StreamFormat, scope, static_cast (busIdx), &descr, &propertySize) == noErr) + currentLayout = AudioChannelSet::canonicalChannelSet (static_cast (descr.mChannelsPerFrame)); } - else + } + } + + //============================================================================== + void numBusesChanged() override + { + updateSupportedLayouts(); + } + + void updateSupportedLayouts() + { + supportedInLayouts.clear(); + supportedOutLayouts.clear(); + numChannelInfos = 0; + channelInfos.free(); + + for (int dir = 0; dir < 2; ++dir) + { + const bool isInput = (dir == 0); + const AudioUnitScope scope = isInput ? kAudioUnitScope_Input : kAudioUnitScope_Output; + const int n = getElementCount (scope); + + for (int busIdx = 0; busIdx < n; ++busIdx) { - numInputBusChannels = (AudioUnitElement) explicitNumIns; - numOutputBusChannels = (AudioUnitElement) explicitNumOuts; + Array supported; + AudioChannelSet currentLayout; + + { + AudioChannelLayout auLayout; + UInt32 propertySize = sizeof (auLayout); - if (maximumNumIns == -1 || (maximumNumIns < 0 && explicitNumIns <= -maximumNumIns)) - numInputBusChannels = 2; + if (AudioUnitGetProperty (audioUnit, kAudioUnitProperty_AudioChannelLayout, scope, static_cast (busIdx), &auLayout, &propertySize) == noErr) + currentLayout = AudioUnitHelpers::CoreAudioChannelLayoutToJuceType (auLayout); + } + + if (currentLayout.isDisabled()) + { + AudioStreamBasicDescription descr; + UInt32 propertySize = sizeof (descr); + + if (AudioUnitGetProperty (audioUnit, kAudioUnitProperty_StreamFormat, scope, static_cast (busIdx), &descr, &propertySize) == noErr) + currentLayout = AudioChannelSet::canonicalChannelSet (static_cast (descr.mChannelsPerFrame)); + } + + supported.clear(); + { + UInt32 propertySize = 0; + Boolean writable; - if (maximumNumOuts == -1 || (maximumNumOuts < 0 && explicitNumOuts <= -maximumNumOuts)) - numOutputBusChannels = 2; + if (AudioUnitGetPropertyInfo (audioUnit, kAudioUnitProperty_SupportedChannelLayoutTags, scope, static_cast (busIdx), &propertySize, &writable) == noErr + && propertySize > 0) + { + const size_t numElements = propertySize / sizeof (AudioChannelLayoutTag); + HeapBlock layoutTags (numElements); + propertySize = static_cast (sizeof (AudioChannelLayoutTag) * numElements); + + if (AudioUnitGetProperty (audioUnit, kAudioUnitProperty_SupportedChannelLayoutTags, scope, + static_cast (busIdx), layoutTags.getData(), &propertySize) == noErr) + { + for (int j = 0; j < static_cast (numElements); ++j) + { + const AudioChannelLayoutTag tag = layoutTags[j]; + + if (tag != kAudioChannelLayoutTag_UseChannelDescriptions) + supported.addIfNotAlreadyThere (AudioUnitHelpers::CALayoutTagToChannelSet (tag)); + } + + if (supported.size() > 0) + supported.addIfNotAlreadyThere (currentLayout); + } + } + } + + (isInput ? supportedInLayouts : supportedOutLayouts).add (supported); } } - else + { - // (this really means the plugin will take any number of ins/outs as long - // as they are the same) - numInputBusChannels = numOutputBusChannels = 2; + UInt32 propertySize = 0; + Boolean writable; + + if (AudioUnitGetPropertyInfo (audioUnit, kAudioUnitProperty_SupportedNumChannels, kAudioUnitScope_Global, 0, &propertySize, &writable) == noErr + && propertySize > 0) + { + numChannelInfos = propertySize / sizeof (AUChannelInfo); + channelInfos.malloc (static_cast (numChannelInfos)); + propertySize = static_cast (sizeof (AUChannelInfo) * static_cast (numChannelInfos)); + + if (AudioUnitGetProperty (audioUnit, kAudioUnitProperty_SupportedNumChannels, kAudioUnitScope_Global, 0, channelInfos.getData(), &propertySize) != noErr) + numChannelInfos = 0; + } + else + { + numChannelInfos = 1; + channelInfos.malloc (static_cast (numChannelInfos)); + channelInfos.getData()->inChannels = -1; + channelInfos.getData()->outChannels = -1; + } } } @@ -2003,7 +2357,8 @@ StringArray AudioUnitPluginFormat::searchPathsForPlugins (const FileSearchPath&, || desc.componentType == kAudioUnitType_MusicEffect || desc.componentType == kAudioUnitType_Effect || desc.componentType == kAudioUnitType_Generator - || desc.componentType == kAudioUnitType_Panner) + || desc.componentType == kAudioUnitType_Panner + || desc.componentType == kAudioUnitType_Mixer) { ignoreUnused (allowPluginsWhichRequireAsynchronousInstantiation); diff --git a/modules/juce_audio_processors/format_types/juce_VST3Common.h b/modules/juce_audio_processors/format_types/juce_VST3Common.h index 3c535195..efc4e337 100644 --- a/modules/juce_audio_processors/format_types/juce_VST3Common.h +++ b/modules/juce_audio_processors/format_types/juce_VST3Common.h @@ -146,14 +146,14 @@ static inline Steinberg::Vst::Speaker getSpeakerType (AudioChannelSet::ChannelTy case AudioChannelSet::left: return kSpeakerL; case AudioChannelSet::right: return kSpeakerR; case AudioChannelSet::centre: return kSpeakerC; - case AudioChannelSet::subbass: return kSpeakerLfe; + case AudioChannelSet::LFE: return kSpeakerLfe; case AudioChannelSet::leftSurround: return kSpeakerLs; case AudioChannelSet::rightSurround: return kSpeakerRs; case AudioChannelSet::leftCentre: return kSpeakerLc; case AudioChannelSet::rightCentre: return kSpeakerRc; - case AudioChannelSet::surround: return kSpeakerS; - case AudioChannelSet::leftRearSurround: return kSpeakerSl; - case AudioChannelSet::rightRearSurround: return kSpeakerSr; + case AudioChannelSet::centreSurround: return kSpeakerCs; + case AudioChannelSet::leftSurroundRear: return kSpeakerSl; + case AudioChannelSet::rightSurroundRear: return kSpeakerSr; case AudioChannelSet::topMiddle: return (1 << 11); /* kSpeakerTm */ case AudioChannelSet::topFrontLeft: return kSpeakerTfl; case AudioChannelSet::topFrontCentre: return kSpeakerTfc; @@ -161,7 +161,7 @@ static inline Steinberg::Vst::Speaker getSpeakerType (AudioChannelSet::ChannelTy case AudioChannelSet::topRearLeft: return kSpeakerTrl; case AudioChannelSet::topRearCentre: return kSpeakerTrc; case AudioChannelSet::topRearRight: return kSpeakerTrr; - case AudioChannelSet::subbass2: return kSpeakerLfe2; + case AudioChannelSet::LFE2: return kSpeakerLfe2; default: break; } @@ -177,14 +177,14 @@ static inline AudioChannelSet::ChannelType getChannelType (Steinberg::Vst::Speak case kSpeakerL: return AudioChannelSet::left; case kSpeakerR: return AudioChannelSet::right; case kSpeakerC: return AudioChannelSet::centre; - case kSpeakerLfe: return AudioChannelSet::subbass; + case kSpeakerLfe: return AudioChannelSet::LFE; case kSpeakerLs: return AudioChannelSet::leftSurround; case kSpeakerRs: return AudioChannelSet::rightSurround; case kSpeakerLc: return AudioChannelSet::leftCentre; case kSpeakerRc: return AudioChannelSet::rightCentre; - case kSpeakerS: return AudioChannelSet::surround; - case kSpeakerSl: return AudioChannelSet::leftRearSurround; - case kSpeakerSr: return AudioChannelSet::rightRearSurround; + case kSpeakerCs: return AudioChannelSet::centreSurround; + case kSpeakerSl: return AudioChannelSet::leftSurroundRear; + case kSpeakerSr: return AudioChannelSet::rightSurroundRear; case (1 << 11): return AudioChannelSet::topMiddle; /* kSpeakerTm */ case kSpeakerTfl: return AudioChannelSet::topFrontLeft; case kSpeakerTfc: return AudioChannelSet::topFrontCentre; @@ -192,18 +192,33 @@ static inline AudioChannelSet::ChannelType getChannelType (Steinberg::Vst::Speak case kSpeakerTrl: return AudioChannelSet::topRearLeft; case kSpeakerTrc: return AudioChannelSet::topRearCentre; case kSpeakerTrr: return AudioChannelSet::topRearRight; - case kSpeakerLfe2: return AudioChannelSet::subbass2; + case kSpeakerLfe2: return AudioChannelSet::LFE2; default: break; } return AudioChannelSet::unknown; } -static inline Steinberg::Vst::SpeakerArrangement getSpeakerArrangement (const AudioChannelSet& channels) noexcept +static inline Steinberg::Vst::SpeakerArrangement getVst3SpeakerArrangement (const AudioChannelSet& channels) noexcept { - // treat mono as special case as we do not have a designated mono speaker - if (channels == AudioChannelSet::mono()) - return Steinberg::Vst::kSpeakerM; + if (channels == AudioChannelSet::disabled()) return Steinberg::Vst::SpeakerArr::kEmpty; + else if (channels == AudioChannelSet::mono()) return Steinberg::Vst::SpeakerArr::kMono; + else if (channels == AudioChannelSet::stereo()) return Steinberg::Vst::SpeakerArr::kStereo; + else if (channels == AudioChannelSet::createLCR()) return Steinberg::Vst::SpeakerArr::k30Cine; + else if (channels == AudioChannelSet::createLRS()) return Steinberg::Vst::SpeakerArr::k30Music; + else if (channels == AudioChannelSet::createLCRS()) return Steinberg::Vst::SpeakerArr::k40Cine; + else if (channels == AudioChannelSet::create5point0()) return Steinberg::Vst::SpeakerArr::k50; + else if (channels == AudioChannelSet::create5point1()) return Steinberg::Vst::SpeakerArr::k51; + else if (channels == AudioChannelSet::create6point0()) return Steinberg::Vst::SpeakerArr::k60Cine; + else if (channels == AudioChannelSet::create6point1()) return Steinberg::Vst::SpeakerArr::k61Cine; + else if (channels == AudioChannelSet::create6point0Music()) return Steinberg::Vst::SpeakerArr::k60Music; + else if (channels == AudioChannelSet::create6point1Music()) return Steinberg::Vst::SpeakerArr::k61Music; + else if (channels == AudioChannelSet::create7point0()) return Steinberg::Vst::SpeakerArr::k70Music; + else if (channels == AudioChannelSet::create7point0SDDS()) return Steinberg::Vst::SpeakerArr::k70Cine; + else if (channels == AudioChannelSet::create7point1()) return Steinberg::Vst::SpeakerArr::k71CineSideFill; + else if (channels == AudioChannelSet::create7point1SDDS()) return Steinberg::Vst::SpeakerArr::k71Cine; + else if (channels == AudioChannelSet::ambisonic()) return Steinberg::Vst::SpeakerArr::kBFormat; + else if (channels == AudioChannelSet::quadraphonic()) return Steinberg::Vst::SpeakerArr::k40Music; Steinberg::Vst::SpeakerArrangement result = 0; @@ -217,9 +232,24 @@ static inline Steinberg::Vst::SpeakerArrangement getSpeakerArrangement (const Au static inline AudioChannelSet getChannelSetForSpeakerArrangement (Steinberg::Vst::SpeakerArrangement arr) noexcept { - // treat mono as special case as we do not have a designated mono speaker - if (arr == Steinberg::Vst::kSpeakerM) - return AudioChannelSet::mono(); + if (arr == Steinberg::Vst::SpeakerArr::kEmpty) return AudioChannelSet::disabled(); + else if (arr == Steinberg::Vst::SpeakerArr::kMono) return AudioChannelSet::mono(); + else if (arr == Steinberg::Vst::SpeakerArr::kStereo) return AudioChannelSet::stereo(); + else if (arr == Steinberg::Vst::SpeakerArr::k30Cine) return AudioChannelSet::createLCR(); + else if (arr == Steinberg::Vst::SpeakerArr::k30Music) return AudioChannelSet::createLRS(); + else if (arr == Steinberg::Vst::SpeakerArr::k40Cine) return AudioChannelSet::createLCRS(); + else if (arr == Steinberg::Vst::SpeakerArr::k50) return AudioChannelSet::create5point0(); + else if (arr == Steinberg::Vst::SpeakerArr::k51) return AudioChannelSet::create5point1(); + else if (arr == Steinberg::Vst::SpeakerArr::k60Cine) return AudioChannelSet::create6point0(); + else if (arr == Steinberg::Vst::SpeakerArr::k61Cine) return AudioChannelSet::create6point1(); + else if (arr == Steinberg::Vst::SpeakerArr::k60Music) return AudioChannelSet::create6point0Music(); + else if (arr == Steinberg::Vst::SpeakerArr::k61Music) return AudioChannelSet::create6point1Music(); + else if (arr == Steinberg::Vst::SpeakerArr::k70Music) return AudioChannelSet::create7point0(); + else if (arr == Steinberg::Vst::SpeakerArr::k70Cine) return AudioChannelSet::create7point0SDDS(); + else if (arr == Steinberg::Vst::SpeakerArr::k71CineSideFill) return AudioChannelSet::create7point1(); + else if (arr == Steinberg::Vst::SpeakerArr::k71Cine) return AudioChannelSet::create7point1SDDS(); + else if (arr == Steinberg::Vst::SpeakerArr::kBFormat) return AudioChannelSet::ambisonic(); + else if (arr == Steinberg::Vst::SpeakerArr::k40Music) return AudioChannelSet::quadraphonic(); AudioChannelSet result; @@ -470,12 +500,12 @@ struct VST3BufferExchange vstBuffers.silenceFlags = 0; } - static void mapArrangementToBusses (int& channelIndexOffset, int index, + static void mapArrangementToBuses (int& channelIndexOffset, int index, Array& result, - BusMap& busMapToUse, Steinberg::Vst::SpeakerArrangement arrangement, + BusMap& busMapToUse, const AudioChannelSet& arrangement, AudioBuffer& source) { - const int numChansForBus = BigInteger ((juce::int64) arrangement).countNumberOfSetBits(); + const int numChansForBus = arrangement.size(); if (index >= result.size()) result.add (Steinberg::Vst::AudioBusBuffers()); @@ -491,26 +521,26 @@ struct VST3BufferExchange channelIndexOffset += numChansForBus; } - static inline void mapBufferToBusses (Array& result, BusMap& busMapToUse, - const Array& arrangements, + static inline void mapBufferToBuses (Array& result, BusMap& busMapToUse, + const Array& arrangements, AudioBuffer& source) { int channelIndexOffset = 0; for (int i = 0; i < arrangements.size(); ++i) - mapArrangementToBusses (channelIndexOffset, i, result, busMapToUse, + mapArrangementToBuses (channelIndexOffset, i, result, busMapToUse, arrangements.getUnchecked (i), source); } - static inline void mapBufferToBusses (Array& result, + static inline void mapBufferToBuses (Array& result, Steinberg::Vst::IAudioProcessor& processor, - BusMap& busMapToUse, bool isInput, int numBusses, + BusMap& busMapToUse, bool isInput, int numBuses, AudioBuffer& source) { int channelIndexOffset = 0; - for (int i = 0; i < numBusses; ++i) - mapArrangementToBusses (channelIndexOffset, i, + for (int i = 0; i < numBuses; ++i) + mapArrangementToBuses (channelIndexOffset, i, result, busMapToUse, getArrangementForBus (&processor, isInput, i), source); diff --git a/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp index 2ba2b14f..3b3851ac 100644 --- a/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp +++ b/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp @@ -121,7 +121,7 @@ static void createPluginDescription (PluginDescription& description, description.isInstrument = description.category.containsIgnoreCase ("Instrument"); // This seems to be the only way to find that out! ARGH! } -static int getNumSingleDirectionBussesFor (Vst::IComponent* component, +static int getNumSingleDirectionBusesFor (Vst::IComponent* component, bool checkInputs, bool checkAudioChannels) { @@ -148,13 +148,13 @@ static int getNumSingleDirectionChannelsFor (Vst::IComponent* component, { Vst::BusInfo busInfo; warnOnFailure (component->getBusInfo (mediaType, direction, i, busInfo)); - numChannels += (int) busInfo.channelCount; + numChannels += ((busInfo.flags & Vst::BusInfo::kDefaultActive) != 0 ? (int) busInfo.channelCount : 0); } return numChannels; } -static void setStateForAllBussesOfType (Vst::IComponent* component, +static void setStateForAllBusesOfType (Vst::IComponent* component, bool state, bool activateInputs, bool activateAudioChannels) @@ -361,7 +361,7 @@ class VST3HostContext : public Vst::IComponentHandler, // From VST V3.0.0 public Vst::IUnitHandler { public: - VST3HostContext (VST3PluginInstance* pluginInstance) : owner (pluginInstance) + VST3HostContext() : plugin (nullptr) { appName = File::getSpecialLocation (File::currentApplicationFile).getFileNameWithoutExtension(); attributeList = new AttributeList (this); @@ -381,68 +381,78 @@ public: //============================================================================== tresult PLUGIN_API beginEdit (Vst::ParamID paramID) override { - const int index = getIndexOfParamID (paramID); + if (plugin != nullptr) + { + const int index = getIndexOfParamID (paramID); - if (index < 0) - return kResultFalse; + if (index < 0) + return kResultFalse; + + plugin->beginParameterChangeGesture (index); + } - owner->beginParameterChangeGesture (index); return kResultTrue; } tresult PLUGIN_API performEdit (Vst::ParamID paramID, Vst::ParamValue valueNormalized) override { - const int index = getIndexOfParamID (paramID); + if (plugin != nullptr) + { + const int index = getIndexOfParamID (paramID); - if (index < 0) - return kResultFalse; + if (index < 0) + return kResultFalse; - owner->sendParamChangeMessageToListeners (index, (float) valueNormalized); + plugin->sendParamChangeMessageToListeners (index, (float) valueNormalized); - { - Steinberg::int32 eventIndex; - owner->inputParameterChanges->addParameterData (paramID, eventIndex)->addPoint (0, valueNormalized, eventIndex); - } + { + Steinberg::int32 eventIndex; + plugin->inputParameterChanges->addParameterData (paramID, eventIndex)->addPoint (0, valueNormalized, eventIndex); + } - // did the plug-in already update the parameter internally - if (owner->editController->getParamNormalized (paramID) != (float) valueNormalized) - return owner->editController->setParamNormalized (paramID, valueNormalized); + // did the plug-in already update the parameter internally + if (plugin->editController->getParamNormalized (paramID) != (float) valueNormalized) + return plugin->editController->setParamNormalized (paramID, valueNormalized); + } return kResultTrue; } tresult PLUGIN_API endEdit (Vst::ParamID paramID) override { - const int index = getIndexOfParamID (paramID); + if (plugin != nullptr) + { + const int index = getIndexOfParamID (paramID); - if (index < 0) - return kResultFalse; + if (index < 0) + return kResultFalse; - owner->endParameterChangeGesture (index); + plugin->endParameterChangeGesture (index); + } return kResultTrue; } tresult PLUGIN_API restartComponent (Steinberg::int32 flags) override { - if (owner != nullptr) + if (plugin != nullptr) { if (hasFlag (flags, Vst::kReloadComponent)) - owner->reset(); + plugin->reset(); if (hasFlag (flags, Vst::kIoChanged)) { - const double sampleRate = owner->getSampleRate(); - const int blockSize = owner->getBlockSize(); + const double sampleRate = plugin->getSampleRate(); + const int blockSize = plugin->getBlockSize(); - owner->prepareToPlay (sampleRate >= 8000 ? sampleRate : 44100.0, + plugin->prepareToPlay (sampleRate >= 8000 ? sampleRate : 44100.0, blockSize > 0 ? blockSize : 1024); } if (hasFlag (flags, Vst::kLatencyChanged)) - if (owner->processor != nullptr) - owner->setLatencySamples (jmax (0, (int) owner->processor->getLatencySamples())); + if (plugin->processor != nullptr) + plugin->setLatencySamples (jmax (0, (int) plugin->processor->getLatencySamples())); - owner->updateHostDisplay(); + plugin->updateHostDisplay(); return kResultTrue; } @@ -475,6 +485,12 @@ public: return kResultFalse; } + void setPlugin (VST3PluginInstance* instance) + { + jassert (plugin == nullptr); + plugin = instance; + } + //============================================================================== class ContextMenu : public Vst::IContextMenu { @@ -637,8 +653,8 @@ public: Vst::IContextMenu* PLUGIN_API createContextMenu (IPlugView*, const Vst::ParamID*) override { - if (owner != nullptr) - return new ContextMenu (*owner); + if (plugin != nullptr) + return new ContextMenu (*plugin); return nullptr; } @@ -696,7 +712,9 @@ public: tresult PLUGIN_API notifyProgramListChange (Vst::ProgramListID, Steinberg::int32) override { - owner->syncProgramNames(); + if (plugin != nullptr) + plugin->syncProgramNames(); + return kResultTrue; } @@ -723,7 +741,7 @@ public: private: //============================================================================== - VST3PluginInstance* const owner; + VST3PluginInstance* plugin; Atomic refCount; String appName; @@ -732,19 +750,19 @@ private: int getIndexOfParamID (Vst::ParamID paramID) { - if (owner == nullptr || owner->editController == nullptr) + if (plugin == nullptr || plugin->editController == nullptr) return -1; int result = getMappedParamID (paramID); if (result < 0) { - const int numParams = owner->editController->getParameterCount(); + const int numParams = plugin->editController->getParameterCount(); for (int i = 0; i < numParams; ++i) { Vst::ParameterInfo paramInfo; - owner->editController->getParameterInfo (i, paramInfo); + plugin->editController->getParameterInfo (i, paramInfo); paramToIndexMap[paramInfo.id] = i; } @@ -1296,7 +1314,7 @@ public: if (pluginFactory != nullptr) { - ComSmartPtr host (new VST3HostContext (nullptr)); + ComSmartPtr host (new VST3HostContext()); DescriptionLister lister (host, pluginFactory); const Result result (lister.findDescriptionsAndPerform (File (fileOrIdentifier))); @@ -1358,7 +1376,7 @@ private: if (pluginFactory != nullptr) { - ComSmartPtr host (new VST3HostContext (nullptr)); + ComSmartPtr host (new VST3HostContext()); MatchingDescriptionFinder finder (host, pluginFactory, description); const Result result (finder.findDescriptionsAndPerform (f)); @@ -1588,24 +1606,205 @@ private: #pragma warning (disable: 4996) // warning about overriding deprecated methods #endif +//============================================================================== +struct VST3ComponentHolder +{ + VST3ComponentHolder (const VST3ModuleHandle::Ptr& handle) + : module (handle), + isComponentInitialised (false) + { + host = new VST3HostContext(); + } + + ~VST3ComponentHolder() + { + terminate(); + + component = nullptr; + host = nullptr; + factory = nullptr; + module = nullptr; + } + + // transfers ownership to the plugin instance! + AudioPluginInstance* createPluginInstance(); + + bool fetchController (ComSmartPtr& editController) + { + if (! isComponentInitialised && ! initialise()) + return false; + + // Get the IEditController: + TUID controllerCID = { 0 }; + + if (component->getControllerClassId (controllerCID) == kResultTrue && FUID (controllerCID).isValid()) + editController.loadFrom (factory, controllerCID); + + if (editController == nullptr) + { + // Try finding the IEditController the long way around: + const Steinberg::int32 numClasses = factory->countClasses(); + for (Steinberg::int32 i = 0; i < numClasses; ++i) + { + PClassInfo classInfo; + factory->getClassInfo (i, &classInfo); + + if (std::strcmp (classInfo.category, kVstComponentControllerClass) == 0) + editController.loadFrom (factory, classInfo.cid); + } + } + + if (editController == nullptr) + editController.loadFrom (component); + + return (editController != nullptr); + } + + //============================================================================== + void fillInPluginDescription (PluginDescription& description) const + { + jassert (module != nullptr && isComponentInitialised); + + PFactoryInfo factoryInfo; + factory->getFactoryInfo (&factoryInfo); + + int classIdx; + if ((classIdx = getClassIndex (module->name)) >= 0) + { + PClassInfo info; + bool success = (factory->getClassInfo (classIdx, &info) == kResultOk); + ignoreUnused (success); + jassert (success); + + ComSmartPtr pf2; + ComSmartPtr pf3; + + ScopedPointer info2; + ScopedPointer infoW; + + if (pf2.loadFrom (factory)) + { + info2 = new PClassInfo2(); + pf2->getClassInfo2 (classIdx, info2); + } + else + { + info2 = nullptr; + } + + if (pf3.loadFrom (factory)) + { + pf3->setHostContext (host->getFUnknown()); + infoW = new PClassInfoW(); + pf3->getClassInfoUnicode (classIdx, infoW); + } + else + { + infoW = nullptr; + } + + Vst::BusInfo bus; + int totalNumInputChannels = 0, totalNumOutputChannels = 0; + + int n = component->getBusCount(Vst::kAudio, Vst::kInput); + for (int i = 0; i < n; ++i) + if (component->getBusInfo (Vst::kAudio, Vst::kInput, i, bus) == kResultOk) + totalNumInputChannels += ((bus.flags & Vst::BusInfo::kDefaultActive) != 0 ? bus.channelCount : 0); + + n = component->getBusCount(Vst::kAudio, Vst::kOutput); + for (int i = 0; i < n; ++i) + if (component->getBusInfo (Vst::kAudio, Vst::kOutput, i, bus) == kResultOk) + totalNumOutputChannels += ((bus.flags & Vst::BusInfo::kDefaultActive) != 0 ? bus.channelCount : 0); + + createPluginDescription (description, module->file, + factoryInfo.vendor, module->name, + info, info2, infoW, + totalNumInputChannels, + totalNumOutputChannels); + } + + jassertfalse; + } + + //============================================================================== + bool initialise() + { + if (isComponentInitialised) return true; + + #if JUCE_WINDOWS + // On Windows it's highly advisable to create your plugins using the message thread, + // because many plugins need a chance to create HWNDs that will get their messages + // delivered by the main message thread, and that's not possible from a background thread. + jassert (MessageManager::getInstance()->isThisTheMessageThread()); + #endif + + factory = ComSmartPtr (module->getPluginFactory()); + + int classIdx; + if ((classIdx = getClassIndex (module->name)) < 0) + return false; + + PClassInfo info; + if (factory->getClassInfo (classIdx, &info) != kResultOk) + return false; + + if (! component.loadFrom (factory, info.cid) || component == nullptr) + return false; + + if (warnOnFailure (component->initialize (host->getFUnknown())) != kResultOk) + return false; + + isComponentInitialised = true; + + return true; + } + + void terminate() + { + if (isComponentInitialised) component->terminate(); + isComponentInitialised = false; + } + + //============================================================================== + int getClassIndex (const String& className) const + { + PClassInfo info; + const Steinberg::int32 numClasses = factory->countClasses(); + + for (Steinberg::int32 j = 0; j < numClasses; ++j) + if (factory->getClassInfo (j, &info) == kResultOk + && std::strcmp (info.category, kVstAudioEffectClass) == 0 + && toString (info.name).trim() == className) + return j; + + return -1; + } + + //============================================================================== + VST3ModuleHandle::Ptr module; + ComSmartPtr factory; + ComSmartPtr host; + ComSmartPtr component; + + bool isComponentInitialised; +}; + //============================================================================== class VST3PluginInstance : public AudioPluginInstance { public: - VST3PluginInstance (const VST3ModuleHandle::Ptr& handle) - : module (handle), - numInputAudioBusses (0), - numOutputAudioBusses (0), + VST3PluginInstance (VST3ComponentHolder* componentHolder) + : AudioPluginInstance (getBusProperties (componentHolder->component)), + holder (componentHolder), programParameterID ((Vst::ParamID) -1), inputParameterChanges (new ParamValueQueueList()), outputParameterChanges (new ParamValueQueueList()), midiInputs (new MidiEventList()), midiOutputs (new MidiEventList()), - isComponentInitialised (false), isControllerInitialised (false), isActive (false) { - host = new VST3HostContext (this); + holder->host->setPlugin (this); } ~VST3PluginInstance() @@ -1623,7 +1822,7 @@ public: editController->setComponentHandler (nullptr); if (isControllerInitialised) editController->terminate(); - if (isComponentInitialised) component->terminate(); + holder->terminate(); componentConnection = nullptr; editControllerConnection = nullptr; @@ -1635,9 +1834,6 @@ public: processor = nullptr; editController2 = nullptr; editController = nullptr; - component = nullptr; - host = nullptr; - module = nullptr; } bool initialise() @@ -1649,20 +1845,20 @@ public: jassert (MessageManager::getInstance()->isThisTheMessageThread()); #endif - ComSmartPtr factory (module->getPluginFactory()); - - PFactoryInfo factoryInfo; - factory->getFactoryInfo (&factoryInfo); - company = toString (factoryInfo.vendor).trim(); - - if (! fetchComponentAndController (factory, factory->countClasses())) + if (! holder->initialise()) return false; + if (! isControllerInitialised) + { + if (! holder->fetchController (editController)) + return false; + } + // (May return an error if the plugin combines the IComponent and IEditController implementations) - editController->initialize (host->getFUnknown()); + editController->initialize (holder->host->getFUnknown()); isControllerInitialised = true; - editController->setComponentHandler (host); + editController->setComponentHandler (holder->host); grabInformationObjects(); interconnectComponentAndController(); synchroniseStates(); @@ -1671,40 +1867,46 @@ public: return true; } - //============================================================================== - void fillInPluginDescription (PluginDescription& description) const override - { - jassert (module != nullptr); - - createPluginDescription (description, module->file, - company, module->name, - *info, info2, infoW, - getTotalNumInputChannels(), - getTotalNumOutputChannels()); - } - - void* getPlatformSpecificData() override { return component; } + void* getPlatformSpecificData() override { return holder->component; } void refreshParameterList() override {} //============================================================================== const String getName() const override { + VST3ModuleHandle::Ptr& module = holder->module; return module != nullptr ? module->name : String(); } - void repopulateArrangements() + void repopulateArrangements (Array& inputArrangements, Array& outputArrangements) const { inputArrangements.clearQuick(); outputArrangements.clearQuick(); - // NB: Some plugins need a valid arrangement despite specifying 0 for their I/O busses - for (int i = 0; i < jmax (1, numInputAudioBusses); ++i) + const int numInputAudioBuses = getBusCount (true); + const int numOutputAudioBuses = getBusCount (false); + + for (int i = 0; i < numInputAudioBuses; ++i) inputArrangements.add (getArrangementForBus (processor, true, i)); - for (int i = 0; i < jmax (1, numOutputAudioBusses); ++i) + for (int i = 0; i < numOutputAudioBuses; ++i) outputArrangements.add (getArrangementForBus (processor, false, i)); } + void processorLayoutsToArrangements (Array& inputArrangements, Array& outputArrangements) + { + inputArrangements.clearQuick(); + outputArrangements.clearQuick(); + + const int numInputBuses = getBusCount (true); + const int numOutputBuses = getBusCount (false); + + for (int i = 0; i < numInputBuses; ++i) + inputArrangements.add (getVst3SpeakerArrangement (getBus (true, i)->getLastEnabledLayout())); + + for (int i = 0; i < numOutputBuses; ++i) + outputArrangements.add (getVst3SpeakerArrangement (getBus (false, i)->getLastEnabledLayout())); + } + void prepareToPlay (double newSampleRate, int estimatedSamplesPerBlock) override { // Avoid redundantly calling things like setActive, which can be a heavy-duty call for some plugins: @@ -1723,41 +1925,37 @@ public: warnOnFailure (processor->setupProcessing (setup)); - if (! isComponentInitialised) - isComponentInitialised = component->initialize (host->getFUnknown()) == kResultTrue; + holder->initialise(); + editController->setComponentHandler (holder->host); - editController->setComponentHandler (host); - if (inputArrangements.size() <= 0 || outputArrangements.size() <= 0) - repopulateArrangements(); + Array inputArrangements, outputArrangements; + processorLayoutsToArrangements (inputArrangements, outputArrangements); - warnOnFailure (processor->setBusArrangements (inputArrangements.getRawDataPointer(), numInputAudioBusses, - outputArrangements.getRawDataPointer(), numOutputAudioBusses)); + warnOnFailure (processor->setBusArrangements (inputArrangements.getRawDataPointer(), inputArrangements.size(), + outputArrangements.getRawDataPointer(), outputArrangements.size())); - // Update the num. busses in case the configuration has been modified by the plugin. (May affect number of channels!): - const int newNumInputAudioBusses = getNumSingleDirectionBussesFor (component, true, true); - const int newNumOutputAudioBusses = getNumSingleDirectionBussesFor (component, false, true); - - // Repopulate arrangements if the number of busses have changed: - if (numInputAudioBusses != newNumInputAudioBusses - || numOutputAudioBusses != newNumOutputAudioBusses) - { - numInputAudioBusses = newNumInputAudioBusses; - numOutputAudioBusses = newNumOutputAudioBusses; + Array actualInArr, actualOutArr; + repopulateArrangements (actualInArr, actualOutArr); - repopulateArrangements(); - } + jassert (actualInArr == inputArrangements && actualOutArr == outputArrangements); // Needed for having the same sample rate in processBlock(); some plugins need this! - setPlayConfigDetails (getNumSingleDirectionChannelsFor (component, true, true), - getNumSingleDirectionChannelsFor (component, false, true), - newSampleRate, estimatedSamplesPerBlock); + setRateAndBufferSizeDetails (newSampleRate, estimatedSamplesPerBlock); + + const int numInputBuses = getBusCount (true); + const int numOutputBuses = getBusCount (false); + + for (int i = 0; i < numInputBuses; ++i) + warnOnFailure (holder->component->activateBus (Vst::kAudio, Vst::kInput, i, getBus (true, i)->isEnabled() ? 1 : 0)); - setStateForAllBusses (true); + for (int i = 0; i < numOutputBuses; ++i) + warnOnFailure (holder->component->activateBus (Vst::kAudio, Vst::kOutput, i, getBus (false, i)->isEnabled() ? 1 : 0)); setLatencySamples (jmax (0, (int) processor->getLatencySamples())); + cachedBusLayouts = getBusesLayout(); - warnOnFailure (component->setActive (true)); + warnOnFailure (holder->component->setActive (true)); warnOnFailure (processor->setProcessing (true)); isActive = true; @@ -1770,13 +1968,13 @@ public: isActive = false; - setStateForAllBusses (false); + setStateForAllMidiBuses (false); if (processor != nullptr) warnOnFailure (processor->setProcessing (false)); - if (component != nullptr) - warnOnFailure (component->setActive (false)); + if (holder->component != nullptr) + warnOnFailure (holder->component->setActive (false)); } bool supportsDoublePrecisionProcessing() const override @@ -1807,11 +2005,14 @@ public: using namespace Vst; const int numSamples = buffer.getNumSamples(); + const int numInputAudioBuses = getBusCount (true); + const int numOutputAudioBuses = getBusCount (false); + ProcessData data; data.processMode = isNonRealtime() ? kOffline : kRealtime; data.symbolicSampleSize = sampleSize; - data.numInputs = numInputAudioBusses; - data.numOutputs = numOutputAudioBusses; + data.numInputs = numInputAudioBuses; + data.numOutputs = numOutputAudioBuses; data.inputParameterChanges = inputParameterChanges; data.outputParameterChanges = outputParameterChanges; data.numSamples = (Steinberg::int32) numSamples; @@ -1831,13 +2032,94 @@ public: inputParameterChanges->clearAllQueues(); } + //============================================================================== + bool canAddBus (bool) const override { return false; } + bool canRemoveBus (bool) const override { return false; } + + bool isBusesLayoutSupported (const BusesLayout& layouts) const override + { + // if the processor is not active, we ask the underlying plug-in if the + // layout is actually supported + if (! isActive) + return canApplyBusesLayout (layouts); + + // not much we can do to check the layout while the audio processor is running + // Let's at least check if it is a VST3 compatible layout + for (int dir = 0; dir < 2; ++dir) + { + const bool isInput = (dir == 0); + const int n = getBusCount (isInput); + for (int i = 0; i < n; ++i) + if (getChannelLayoutOfBus(isInput, i).isDiscreteLayout()) + return false; + } + + return true; + } + + bool syncBusLayouts (const BusesLayout& layouts) const + { + for (int dir = 0; dir < 2; ++dir) + { + const bool isInput = (dir == 0); + const int n = getBusCount (isInput); + const Vst::BusDirection vstDir = (isInput ? Vst::kInput : Vst::kOutput); + + for (int busIdx = 0; busIdx < n; ++busIdx) + { + const bool isEnabled = (! layouts.getChannelSet (isInput, busIdx).isDisabled()); + if (holder->component->activateBus (Vst::kAudio, vstDir, busIdx, (isEnabled ? 1 : 0)) != kResultOk) + return false; + } + } + + Array inputArrangements, outputArrangements; + + for (int i = 0; i < layouts.inputBuses.size(); ++i) + { + const AudioChannelSet& requested = layouts.getChannelSet (true, i); + inputArrangements.add (getVst3SpeakerArrangement (requested.isDisabled() ? getBus (true, i)->getLastEnabledLayout() : requested)); + } + + for (int i = 0; i < layouts.outputBuses.size(); ++i) + { + const AudioChannelSet& requested = layouts.getChannelSet (false, i); + outputArrangements.add (getVst3SpeakerArrangement (requested.isDisabled() ? getBus (false, i)->getLastEnabledLayout() : requested)); + } + + if (processor->setBusArrangements (inputArrangements.getRawDataPointer(), inputArrangements.size(), + outputArrangements.getRawDataPointer(), outputArrangements.size()) != kResultTrue) + return false; + + // check if the layout matches the request + Array actualIn, actualOut; + repopulateArrangements (actualIn, actualOut); + + return (actualIn == inputArrangements && actualOut == outputArrangements); + } + + bool canApplyBusesLayout (const BusesLayout& layouts) const override + { + // someone tried to change the layout while the AudioProcessor is running + // call releaseResources first! + jassert (! isActive); + + bool result = syncBusLayouts (layouts); + + // didn't succeed? Make sure it's back in it's original state + if (! result) + syncBusLayouts (getBusesLayout()); + + return result; + } + //============================================================================== String getChannelName (int channelIndex, bool forInput, bool forAudioChannel) const { - const int numBusses = getNumSingleDirectionBussesFor (component, forInput, forAudioChannel); + const int numBuses = getNumSingleDirectionBusesFor (holder->component, forInput, forAudioChannel); int numCountedChannels = 0; - for (int i = 0; i < numBusses; ++i) + for (int i = 0; i < numBuses; ++i) { Vst::BusInfo busInfo (getBusInfo (forInput, forAudioChannel, i)); @@ -1976,12 +2258,12 @@ public: //============================================================================== void reset() override { - if (component != nullptr && processor != nullptr) + if (holder->component != nullptr && processor != nullptr) { processor->setProcessing (false); - component->setActive (false); + holder->component->setActive (false); - component->setActive (true); + holder->component->setActive (true); processor->setProcessing (true); } } @@ -1991,7 +2273,7 @@ public: { XmlElement state ("VST3PluginState"); - appendStateFrom (state, component, "IComponent"); + appendStateFrom (state, holder->component, "IComponent"); appendStateFrom (state, editController, "IEditController"); AudioProcessor::copyXmlToBinary (state, destData); @@ -2005,8 +2287,8 @@ public: { ComSmartPtr s (createMemoryStreamForState (*head, "IComponent")); - if (s != nullptr && component != nullptr) - component->setState (s); + if (s != nullptr && holder->component != nullptr) + holder->component->setState (s); if (editController != nullptr) { @@ -2021,6 +2303,12 @@ public: } } + //============================================================================== + void fillInPluginDescription (PluginDescription& description) const override + { + holder->fillInPluginDescription (description); + } + /** @note Not applicable to VST3 */ void getCurrentProgramStateInformation (MemoryBlock& destData) override { @@ -2076,7 +2364,7 @@ public: struct ParamValueQueue : public Vst::IParamValueQueue { - ParamValueQueue () : paramID (static_cast (-1)) + ParamValueQueue() : paramID (static_cast (-1)) { points.ensureStorageAllocated (1024); } @@ -2152,10 +2440,9 @@ public: private: //============================================================================== - VST3ModuleHandle::Ptr module; + ScopedPointer holder; friend VST3HostContext; - ComSmartPtr host; // Information objects: String company; @@ -2164,7 +2451,6 @@ private: ScopedPointer infoW; // Rudimentary interfaces: - ComSmartPtr component; ComSmartPtr editController; ComSmartPtr editController2; ComSmartPtr processor; @@ -2176,14 +2462,13 @@ private: ComSmartPtr componentConnection; ComSmartPtr editControllerConnection; - /** The number of IO busses MUST match that of the plugin, + /** The number of IO buses MUST match that of the plugin, even if there aren't enough channels to process, as very poorly specified by the Steinberg SDK */ - int numInputAudioBusses, numOutputAudioBusses; - Array inputArrangements, outputArrangements; // Caching to improve performance and to avoid possible non-thread-safe calls to getBusArrangements(). VST3FloatAndDoubleBusMapComposite inputBusMap, outputBusMap; - Array inputBusses, outputBusses; + Array inputBuses, outputBuses; + AudioProcessor::BusesLayout cachedBusLayouts; StringArray programNames; Vst::ParamID programParameterID; @@ -2226,117 +2511,13 @@ private: ComSmartPtr inputParameterChanges, outputParameterChanges; ComSmartPtr midiInputs, midiOutputs; Vst::ProcessContext timingInfo; //< Only use this in processBlock()! - bool isComponentInitialised, isControllerInitialised, isActive; + bool isControllerInitialised, isActive; //============================================================================== - bool fetchComponentAndController (IPluginFactory* factory, const Steinberg::int32 numClasses) - { - jassert (numClasses >= 0); // The plugin must provide at least an IComponent and IEditController! - - for (Steinberg::int32 j = 0; j < numClasses; ++j) - { - info = new PClassInfo(); - factory->getClassInfo (j, info); - - if (std::strcmp (info->category, kVstAudioEffectClass) != 0) - continue; - - const String name (toString (info->name).trim()); - - if (module->name != name) - continue; - - { - ComSmartPtr pf2; - ComSmartPtr pf3; - - if (pf2.loadFrom (factory)) - { - info2 = new PClassInfo2(); - pf2->getClassInfo2 (j, info2); - } - else - { - info2 = nullptr; - } - - if (pf3.loadFrom (factory)) - { - pf3->setHostContext (host->getFUnknown()); - infoW = new PClassInfoW(); - pf3->getClassInfoUnicode (j, infoW); - } - else - { - infoW = nullptr; - } - } - - bool failed = true; - - if (component.loadFrom (factory, info->cid) && component != nullptr) - { - warnOnFailure (component->setIoMode (isNonRealtime() ? Vst::kOffline : Vst::kRealtime)); - - if (warnOnFailure (component->initialize (host->getFUnknown())) != kResultOk) - return false; - - isComponentInitialised = true; - - // Get the IEditController: - TUID controllerCID = { 0 }; - - if (component->getControllerClassId (controllerCID) == kResultTrue && FUID (controllerCID).isValid()) - editController.loadFrom (factory, controllerCID); - - if (editController == nullptr) - { - // Try finding the IEditController the long way around: - for (Steinberg::int32 i = 0; i < numClasses; ++i) - { - PClassInfo classInfo; - factory->getClassInfo (i, &classInfo); - - if (std::strcmp (classInfo.category, kVstComponentControllerClass) == 0) - editController.loadFrom (factory, classInfo.cid); - } - } - - if (editController == nullptr) - editController.loadFrom (component); - - failed = editController == nullptr; - } - - if (failed) - { - jassertfalse; // The plugin won't function without a valid IComponent and IEditController implementation! - - if (component != nullptr) - { - component->terminate(); - component = nullptr; - } - - if (editController != nullptr) - { - editController->terminate(); - editController = nullptr; - } - - break; - } - - return true; - } - - return false; - } - /** Some plugins need to be "connected" to intercommunicate between their implemented classes */ void interconnectComponentAndController() { - componentConnection.loadFrom (component); + componentConnection.loadFrom (holder->component); editControllerConnection.loadFrom (editController); if (componentConnection != nullptr && editControllerConnection != nullptr) @@ -2350,20 +2531,20 @@ private: { Steinberg::MemoryStream stream; - if (component->getState (&stream) == kResultTrue) + if (holder->component->getState (&stream) == kResultTrue) if (stream.seek (0, Steinberg::IBStream::kIBSeekSet, nullptr) == kResultTrue) warnOnFailure (editController->setComponentState (&stream)); } void grabInformationObjects() { - processor.loadFrom (component); - unitInfo.loadFrom (component); - programListData.loadFrom (component); - unitData.loadFrom (component); - editController2.loadFrom (component); - componentHandler.loadFrom (component); - componentHandler2.loadFrom (component); + processor.loadFrom (holder->component); + unitInfo.loadFrom (holder->component); + programListData.loadFrom (holder->component); + unitData.loadFrom (holder->component); + editController2.loadFrom (holder->component); + componentHandler.loadFrom (holder->component); + componentHandler2.loadFrom (holder->component); if (processor == nullptr) processor.loadFrom (editController); if (unitInfo == nullptr) unitInfo.loadFrom (editController); @@ -2374,17 +2555,15 @@ private: if (componentHandler2 == nullptr) componentHandler2.loadFrom (editController); } - void setStateForAllBusses (bool newState) + void setStateForAllMidiBuses (bool newState) { - setStateForAllBussesOfType (component, newState, true, true); // Activate/deactivate audio inputs - setStateForAllBussesOfType (component, newState, false, true); // Activate/deactivate audio outputs - setStateForAllBussesOfType (component, newState, true, false); // Activate/deactivate MIDI inputs - setStateForAllBussesOfType (component, newState, false, false); // Activate/deactivate MIDI outputs + setStateForAllBusesOfType (holder->component, newState, true, false); // Activate/deactivate MIDI inputs + setStateForAllBusesOfType (holder->component, newState, false, false); // Activate/deactivate MIDI outputs } void setupIO() { - setStateForAllBusses (true); + setStateForAllMidiBuses (true); Vst::ProcessSetup setup; setup.symbolicSampleSize = Vst::kSample32; @@ -2394,12 +2573,44 @@ private: warnOnFailure (processor->setupProcessing (setup)); - numInputAudioBusses = getNumSingleDirectionBussesFor (component, true, true); - numOutputAudioBusses = getNumSingleDirectionBussesFor (component, false, true); + cachedBusLayouts = getBusesLayout(); + setRateAndBufferSizeDetails (setup.sampleRate, (int) setup.maxSamplesPerBlock); + } + + static AudioProcessor::BusesProperties getBusProperties (ComSmartPtr& component) + { + AudioProcessor::BusesProperties busProperties; + ComSmartPtr processor; + processor.loadFrom (component.get()); + + for (int dirIdx = 0; dirIdx < 2; ++dirIdx) + { + const bool isInput = (dirIdx == 0); + const Vst::BusDirection dir = (isInput ? Vst::kInput : Vst::kOutput); + const int numBuses = component->getBusCount (Vst::kAudio, dir); + + for (int i = 0; i < numBuses; ++i) + { + Vst::BusInfo info; + + if (component->getBusInfo (Vst::kAudio, dir, (Steinberg::int32) i, info) != kResultOk) + continue; + + if (info.channelCount == 0) + continue; + + AudioChannelSet layout = AudioChannelSet::discreteChannels (info.channelCount); - setPlayConfigDetails (getNumSingleDirectionChannelsFor (component, true, true), - getNumSingleDirectionChannelsFor (component, false, true), - setup.sampleRate, (int) setup.maxSamplesPerBlock); + Vst::SpeakerArrangement arr; + if (processor != nullptr && processor->getBusArrangement (dir, i, arr) == kResultOk) + layout = getChannelSetForSpeakerArrangement (arr); + + busProperties.addBus (isInput, toString (info.name), layout, + (info.flags & Vst::BusInfo::kDefaultActive) != 0); + } + } + + return busProperties; } //============================================================================== @@ -2410,8 +2621,8 @@ private: busInfo.direction = forInput ? Vst::kInput : Vst::kOutput; busInfo.channelCount = 0; - component->getBusInfo (busInfo.mediaType, busInfo.direction, - (Steinberg::int32) index, busInfo); + holder->component->getBusInfo (busInfo.mediaType, busInfo.direction, + (Steinberg::int32) index, busInfo); return busInfo; } @@ -2431,11 +2642,11 @@ private: template void associateTo (Vst::ProcessData& destination, AudioBuffer& buffer) { - VST3BufferExchange::mapBufferToBusses (inputBusses, inputBusMap.get(), inputArrangements, buffer); - VST3BufferExchange::mapBufferToBusses (outputBusses, outputBusMap.get(), outputArrangements, buffer); + VST3BufferExchange::mapBufferToBuses (inputBuses, inputBusMap.get(), cachedBusLayouts.inputBuses, buffer); + VST3BufferExchange::mapBufferToBuses (outputBuses, outputBusMap.get(), cachedBusLayouts.outputBuses, buffer); - destination.inputs = inputBusses.getRawDataPointer(); - destination.outputs = outputBusses.getRawDataPointer(); + destination.inputs = inputBuses.getRawDataPointer(); + destination.outputs = outputBuses.getRawDataPointer(); } void associateTo (Vst::ProcessData& destination, MidiBuffer& midiBuffer) @@ -2475,7 +2686,7 @@ private: return paramInfo; } - void syncProgramNames () + void syncProgramNames() { programNames.clear(); @@ -2555,6 +2766,18 @@ private: }; +//============================================================================== +AudioPluginInstance* VST3Classes::VST3ComponentHolder::createPluginInstance() +{ + if (! initialise()) + return nullptr; + + VST3PluginInstance* plugin = new VST3PluginInstance (this); + host->setPlugin (plugin); + return plugin; +} + + //============================================================================== VST3PluginFormat::VST3PluginFormat() {} VST3PluginFormat::~VST3PluginFormat() {} @@ -2575,7 +2798,6 @@ void VST3PluginFormat::createPluginInstance (const PluginDescription& descriptio { ScopedPointer result; - if (fileMightContainThisPluginType (description.fileOrIdentifier)) { File file (description.fileOrIdentifier); @@ -2585,10 +2807,13 @@ void VST3PluginFormat::createPluginInstance (const PluginDescription& descriptio if (const VST3Classes::VST3ModuleHandle::Ptr module = VST3Classes::VST3ModuleHandle::findOrCreateModule (file, description)) { - result = new VST3Classes::VST3PluginInstance (module); - - if (! result->initialise()) - result = nullptr; + ScopedPointer holder = new VST3Classes::VST3ComponentHolder (module); + if (holder->initialise()) + { + result = new VST3Classes::VST3PluginInstance (holder.release()); + if (! result->initialise()) + result = nullptr; + } } previousWorkingDirectory.setAsCurrentWorkingDirectory(); diff --git a/modules/juce_audio_processors/format_types/juce_VSTCommon.h b/modules/juce_audio_processors/format_types/juce_VSTCommon.h new file mode 100644 index 00000000..1869941d --- /dev/null +++ b/modules/juce_audio_processors/format_types/juce_VSTCommon.h @@ -0,0 +1,238 @@ +/* + ============================================================================== + + This file is part of the JUCE library. + Copyright (c) 2015 - ROLI Ltd. + + Permission is granted to use this software under the terms of either: + a) the GPL v2 (or any later version) + b) the Affero GPL v3 + + Details of these licenses can be found at: www.gnu.org/licenses + + JUCE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.juce.com for more information. + + ============================================================================== +*/ + +#ifndef JUCE_VSTCOMMON_H_INCLUDED +#define JUCE_VSTCOMMON_H_INCLUDED + +//============================================================================== +struct SpeakerMappings : private AudioChannelSet // (inheritance only to give easier access to items in the namespace) +{ + struct Mapping + { + int32 vst2; + ChannelType channels[13]; + + bool matches (const Array& chans) const noexcept + { + const int n = sizeof (channels) / sizeof (ChannelType); + + for (int i = 0; i < n; ++i) + { + if (channels[i] == unknown) return (i == chans.size()); + if (i == chans.size()) return (channels[i] == unknown); + + if (channels[i] != chans.getUnchecked(i)) + return false; + } + + return true; + } + }; + + static AudioChannelSet vstArrangementTypeToChannelSet (int32 arr, int fallbackNumChannels) + { + if (arr == vstSpeakerConfigTypeEmpty) return AudioChannelSet::disabled(); + else if (arr == vstSpeakerConfigTypeMono) return AudioChannelSet::mono(); + else if (arr == vstSpeakerConfigTypeLR) return AudioChannelSet::stereo(); + else if (arr == vstSpeakerConfigTypeLRC) return AudioChannelSet::createLCR(); + else if (arr == vstSpeakerConfigTypeLRS) return AudioChannelSet::createLRS(); + else if (arr == vstSpeakerConfigTypeLRCS) return AudioChannelSet::createLCRS(); + else if (arr == vstSpeakerConfigTypeLRCLsRs) return AudioChannelSet::create5point0(); + else if (arr == vstSpeakerConfigTypeLRCLfeLsRs) return AudioChannelSet::create5point1(); + else if (arr == vstSpeakerConfigTypeLRCLsRsCs) return AudioChannelSet::create6point0(); + else if (arr == vstSpeakerConfigTypeLRCLfeLsRsCs) return AudioChannelSet::create6point1(); + else if (arr == vstSpeakerConfigTypeLRLsRsSlSr) return AudioChannelSet::create6point0Music(); + else if (arr == vstSpeakerConfigTypeLRLfeLsRsSlSr) return AudioChannelSet::create6point1Music(); + else if (arr == vstSpeakerConfigTypeLRCLsRsSlSr) return AudioChannelSet::create7point0(); + else if (arr == vstSpeakerConfigTypeLRCLsRsLcRc) return AudioChannelSet::create7point0SDDS(); + else if (arr == vstSpeakerConfigTypeLRCLfeLsRsSlSr) return AudioChannelSet::create7point1(); + else if (arr == vstSpeakerConfigTypeLRCLfeLsRsLcRc) return AudioChannelSet::create7point1SDDS(); + else if (arr == vstSpeakerConfigTypeLRLsRs) return AudioChannelSet::quadraphonic(); + + for (const Mapping* m = getMappings(); m->vst2 != vstSpeakerConfigTypeEmpty; ++m) + { + if (m->vst2 == arr) + { + AudioChannelSet s; + + for (int i = 0; m->channels[i] != 0; ++i) + s.addChannel (m->channels[i]); + + return s; + } + } + + return AudioChannelSet::discreteChannels (fallbackNumChannels); + } + + static AudioChannelSet vstArrangementTypeToChannelSet (const VstSpeakerConfiguration& arr) + { + return vstArrangementTypeToChannelSet (arr.type, arr.numberOfChannels); + } + + static int32 channelSetToVstArrangementType (AudioChannelSet channels) + { + if (channels == AudioChannelSet::disabled()) return vstSpeakerConfigTypeEmpty; + else if (channels == AudioChannelSet::mono()) return vstSpeakerConfigTypeMono; + else if (channels == AudioChannelSet::stereo()) return vstSpeakerConfigTypeLR; + else if (channels == AudioChannelSet::createLCR()) return vstSpeakerConfigTypeLRC; + else if (channels == AudioChannelSet::createLRS()) return vstSpeakerConfigTypeLRS; + else if (channels == AudioChannelSet::createLCRS()) return vstSpeakerConfigTypeLRCS; + else if (channels == AudioChannelSet::create5point0()) return vstSpeakerConfigTypeLRCLsRs; + else if (channels == AudioChannelSet::create5point1()) return vstSpeakerConfigTypeLRCLfeLsRs; + else if (channels == AudioChannelSet::create6point0()) return vstSpeakerConfigTypeLRCLsRsCs; + else if (channels == AudioChannelSet::create6point1()) return vstSpeakerConfigTypeLRCLfeLsRsCs; + else if (channels == AudioChannelSet::create6point0Music()) return vstSpeakerConfigTypeLRLsRsSlSr; + else if (channels == AudioChannelSet::create6point1Music()) return vstSpeakerConfigTypeLRLfeLsRsSlSr; + else if (channels == AudioChannelSet::create7point0()) return vstSpeakerConfigTypeLRCLsRsSlSr; + else if (channels == AudioChannelSet::create7point0SDDS()) return vstSpeakerConfigTypeLRCLsRsLcRc; + else if (channels == AudioChannelSet::create7point1()) return vstSpeakerConfigTypeLRCLfeLsRsSlSr; + else if (channels == AudioChannelSet::create7point1SDDS()) return vstSpeakerConfigTypeLRCLfeLsRsLcRc; + else if (channels == AudioChannelSet::quadraphonic()) return vstSpeakerConfigTypeLRLsRs; + + Array chans (channels.getChannelTypes()); + + if (channels == AudioChannelSet::disabled()) + return vstSpeakerConfigTypeEmpty; + + for (const Mapping* m = getMappings(); m->vst2 != vstSpeakerConfigTypeEmpty; ++m) + if (m->matches (chans)) + return m->vst2; + + return vstSpeakerConfigTypeUser; + } + + static void channelSetToVstArrangement (const AudioChannelSet& channels, VstSpeakerConfiguration& result) + { + result.type = channelSetToVstArrangementType (channels); + result.numberOfChannels = channels.size(); + + for (int i = 0; i < result.numberOfChannels; ++i) + { + VstIndividualSpeakerInfo& speaker = result.speakers[i]; + + zeromem (&speaker, sizeof (VstIndividualSpeakerInfo)); + speaker.type = getSpeakerType (channels.getTypeOfChannel (i)); + } + } + + static const Mapping* getMappings() noexcept + { + static const Mapping mappings[] = + { + { vstSpeakerConfigTypeMono, { centre, unknown } }, + { vstSpeakerConfigTypeLR, { left, right, unknown } }, + { vstSpeakerConfigTypeLsRs, { leftSurround, rightSurround, unknown } }, + { vstSpeakerConfigTypeLcRc, { leftCentre, rightCentre, unknown } }, + { vstSpeakerConfigTypeSlSr, { leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeCLfe, { centre, LFE, unknown } }, + { vstSpeakerConfigTypeLRC, { left, right, centre, unknown } }, + { vstSpeakerConfigTypeLRS, { left, right, surround, unknown } }, + { vstSpeakerConfigTypeLRCLfe, { left, right, centre, LFE, unknown } }, + { vstSpeakerConfigTypeLRLfeS, { left, right, LFE, surround, unknown } }, + { vstSpeakerConfigTypeLRCS, { left, right, centre, surround, unknown } }, + { vstSpeakerConfigTypeLRLsRs, { left, right, leftSurround, rightSurround, unknown } }, + { vstSpeakerConfigTypeLRCLfeS, { left, right, centre, LFE, surround, unknown } }, + { vstSpeakerConfigTypeLRLfeLsRs, { left, right, LFE, leftSurround, rightSurround, unknown } }, + { vstSpeakerConfigTypeLRCLsRs, { left, right, centre, leftSurround, rightSurround, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRs, { left, right, centre, LFE, leftSurround, rightSurround, unknown } }, + { vstSpeakerConfigTypeLRCLsRsCs, { left, right, centre, leftSurround, rightSurround, surround, unknown } }, + { vstSpeakerConfigTypeLRLsRsSlSr, { left, right, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsCs, { left, right, centre, LFE, leftSurround, rightSurround, surround, unknown } }, + { vstSpeakerConfigTypeLRLfeLsRsSlSr, { left, right, LFE, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeLRCLsRsLcRc, { left, right, centre, leftSurround, rightSurround, topFrontLeft, topFrontRight, unknown } }, + { vstSpeakerConfigTypeLRCLsRsSlSr, { left, right, centre, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsLcRc, { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontRight, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsSlSr, { left, right, centre, LFE, leftSurround, rightSurround, leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeLRCLsRsLcRcCs, { left, right, centre, leftSurround, rightSurround, topFrontLeft, topFrontRight, surround, unknown } }, + { vstSpeakerConfigTypeLRCLsRsCsSlSr, { left, right, centre, leftSurround, rightSurround, surround, leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsLcRcCs, { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontRight, surround, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsCsSlSr, { left, right, centre, LFE, leftSurround, rightSurround, surround, leftSurroundRear, rightSurroundRear, unknown } }, + { vstSpeakerConfigTypeLRCLfeLsRsTflTfcTfrTrlTrrLfe2, { left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontCentre, topFrontRight, topRearLeft, topRearRight, LFE2, unknown } }, + { vstSpeakerConfigTypeEmpty, { unknown } } + }; + + return mappings; + } + + static inline int32 getSpeakerType (AudioChannelSet::ChannelType type) noexcept + { + switch (type) + { + case AudioChannelSet::left: return vstIndividualSpeakerTypeLeft; + case AudioChannelSet::right: return vstIndividualSpeakerTypeRight; + case AudioChannelSet::centre: return vstIndividualSpeakerTypeCentre; + case AudioChannelSet::LFE: return vstIndividualSpeakerTypeLFE; + case AudioChannelSet::leftSurround: return vstIndividualSpeakerTypeLeftSurround; + case AudioChannelSet::rightSurround: return vstIndividualSpeakerTypeRightSurround; + case AudioChannelSet::leftCentre: return vstIndividualSpeakerTypeLeftCentre; + case AudioChannelSet::rightCentre: return vstIndividualSpeakerTypeRightCentre; + case AudioChannelSet::surround: return vstIndividualSpeakerTypeSurround; + case AudioChannelSet::leftSurroundRear: return vstIndividualSpeakerTypeLeftRearSurround; + case AudioChannelSet::rightSurroundRear: return vstIndividualSpeakerTypeRightRearSurround; + case AudioChannelSet::topMiddle: return vstIndividualSpeakerTypeTopMiddle; + case AudioChannelSet::topFrontLeft: return vstIndividualSpeakerTypeTopFrontLeft; + case AudioChannelSet::topFrontCentre: return vstIndividualSpeakerTypeTopFrontCentre; + case AudioChannelSet::topFrontRight: return vstIndividualSpeakerTypeTopFrontRight; + case AudioChannelSet::topRearLeft: return vstIndividualSpeakerTypeTopRearLeft; + case AudioChannelSet::topRearCentre: return vstIndividualSpeakerTypeTopRearCentre; + case AudioChannelSet::topRearRight: return vstIndividualSpeakerTypeTopRearRight; + case AudioChannelSet::LFE2: return vstIndividualSpeakerTypeLFE2; + default: break; + } + + return 0; + } + + static inline AudioChannelSet::ChannelType getChannelType (int32 type) noexcept + { + switch (type) + { + case vstIndividualSpeakerTypeLeft: return AudioChannelSet::left; + case vstIndividualSpeakerTypeRight: return AudioChannelSet::right; + case vstIndividualSpeakerTypeCentre: return AudioChannelSet::centre; + case vstIndividualSpeakerTypeLFE: return AudioChannelSet::LFE; + case vstIndividualSpeakerTypeLeftSurround: return AudioChannelSet::leftSurround; + case vstIndividualSpeakerTypeRightSurround: return AudioChannelSet::rightSurround; + case vstIndividualSpeakerTypeLeftCentre: return AudioChannelSet::leftCentre; + case vstIndividualSpeakerTypeRightCentre: return AudioChannelSet::rightCentre; + case vstIndividualSpeakerTypeSurround: return AudioChannelSet::surround; + case vstIndividualSpeakerTypeLeftRearSurround: return AudioChannelSet::leftSurroundRear; + case vstIndividualSpeakerTypeRightRearSurround: return AudioChannelSet::rightSurroundRear; + case vstIndividualSpeakerTypeTopMiddle: return AudioChannelSet::topMiddle; + case vstIndividualSpeakerTypeTopFrontLeft: return AudioChannelSet::topFrontLeft; + case vstIndividualSpeakerTypeTopFrontCentre: return AudioChannelSet::topFrontCentre; + case vstIndividualSpeakerTypeTopFrontRight: return AudioChannelSet::topFrontRight; + case vstIndividualSpeakerTypeTopRearLeft: return AudioChannelSet::topRearLeft; + case vstIndividualSpeakerTypeTopRearCentre: return AudioChannelSet::topRearCentre; + case vstIndividualSpeakerTypeTopRearRight: return AudioChannelSet::topRearRight; + case vstIndividualSpeakerTypeLFE2: return AudioChannelSet::LFE2; + default: break; + } + + return AudioChannelSet::unknown; + } +}; + +#endif // JUCE_VSTCOMMON_H_INCLUDED diff --git a/modules/juce_audio_processors/format_types/juce_VSTInterface.h b/modules/juce_audio_processors/format_types/juce_VSTInterface.h index b0d1bd05..502f3672 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTInterface.h +++ b/modules/juce_audio_processors/format_types/juce_VSTInterface.h @@ -386,7 +386,7 @@ enum VstIndividualSpeakerType vstIndividualSpeakerTypeLeft, vstIndividualSpeakerTypeRight, vstIndividualSpeakerTypeCentre, - vstIndividualSpeakerTypeSubbass, + vstIndividualSpeakerTypeLFE, vstIndividualSpeakerTypeLeftSurround, vstIndividualSpeakerTypeRightSurround, vstIndividualSpeakerTypeLeftCentre, @@ -402,7 +402,7 @@ enum VstIndividualSpeakerType vstIndividualSpeakerTypeTopRearLeft, vstIndividualSpeakerTypeTopRearCentre, vstIndividualSpeakerTypeTopRearRight, - vstIndividualSpeakerTypeSubbass2 + vstIndividualSpeakerTypeLFE2 }; struct VstSpeakerConfiguration diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp index 0fe23042..d381031c 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -44,6 +44,8 @@ namespace #include "juce_VSTInterface.h" } +#include "juce_VSTCommon.h" + #if JUCE_MSVC #pragma warning (pop) #pragma warning (disable: 4355) // ("this" used in initialiser list warning) @@ -368,8 +370,11 @@ public: //============================================================================== ModuleHandle (const File& f, MainCall customMainCall) : file (f), moduleMain (customMainCall), customMain (nullptr) + #if JUCE_MAC || JUCE_IOS + , resHandle (0), bundleRef (0) #if JUCE_MAC - , resHandle (0), bundleRef (0), resFileId (0) + , resFileId (0) + #endif #endif { getActiveModules().add (this); @@ -585,58 +590,59 @@ class VSTPluginInstance : public AudioPluginInstance, private Timer, private AsyncUpdater { -public: - VSTPluginInstance (const ModuleHandle::Ptr& mh) - : effect (nullptr), - module (mh), +private: + VSTPluginInstance (const ModuleHandle::Ptr& mh, const BusesProperties& ioConfig, VstEffectInterface* effect) + : AudioPluginInstance (ioConfig), + vstEffect (effect), + vstModule (mh), usesCocoaNSView (false), name (mh->pluginName), wantsMidiMessages (false), initialised (false), isPowerOn (false) + {} + +public: + ~VSTPluginInstance() { - try + if (vstEffect != nullptr && vstEffect->interfaceIdentifier == juceVstInterfaceIdentifier) { - const IdleCallRecursionPreventer icrp; - _fpreset(); - - JUCE_VST_LOG ("Creating VST instance: " + name); + struct VSTDeleter : public CallbackMessage + { + VSTDeleter (VSTPluginInstance& inInstance, WaitableEvent& inEvent) + : vstInstance (inInstance), completionSignal (inEvent) + {} - #if JUCE_MAC - if (module->resFileId != 0) - UseResFile (module->resFileId); - #endif + void messageCallback() override + { + vstInstance.cleanup(); + completionSignal.signal(); + } - { - JUCE_VST_WRAPPER_INVOKE_MAIN - } + VSTPluginInstance& vstInstance; + WaitableEvent& completionSignal; + }; - if (effect != nullptr && effect->interfaceIdentifier == juceVstInterfaceIdentifier) + if (MessageManager::getInstance()->isThisTheMessageThread()) { - jassert (effect->hostSpace2 == 0); - jassert (effect->effectPointer != 0); - - _fpreset(); // some dodgy plugs mess around with this + cleanup(); } else { - effect = nullptr; + WaitableEvent completionEvent; + (new VSTDeleter (*this, completionEvent))->post(); + completionEvent.wait(); } } - catch (...) - {} } - ~VSTPluginInstance() + void cleanup() { - const ScopedLock sl (lock); - stopTimer(); - - if (effect != nullptr && effect->interfaceIdentifier == juceVstInterfaceIdentifier) + if (vstEffect != nullptr && vstEffect->interfaceIdentifier == juceVstInterfaceIdentifier) { #if JUCE_MAC - if (module->resFileId != 0) - UseResFile (module->resFileId); + if (vstModule->resFileId != 0) + UseResFile (vstModule->resFileId); #endif // Must delete any editors before deleting the plugin instance! @@ -644,13 +650,40 @@ public: _fpreset(); // some dodgy plugs fuck around with this - module->closeEffect (effect); + vstModule->closeEffect (vstEffect); } - module = nullptr; - effect = nullptr; + vstModule = nullptr; + vstEffect = nullptr; } + static VSTPluginInstance* create (const ModuleHandle::Ptr& newModule, + double initialSampleRate, + int initialBlockSize) + { + if (VstEffectInterface* newEffect = constructEffect (newModule)) + { + newEffect->hostSpace2 = 0; + + newEffect->dispatchFunction (newEffect, plugInOpcodeIdentify, 0, 0, 0, 0); + + newEffect->dispatchFunction (newEffect, plugInOpcodeSetSampleRate, 0, 0, 0, static_cast (initialSampleRate)); + newEffect->dispatchFunction (newEffect, plugInOpcodeSetBlockSize, 0, jmax (32, initialBlockSize), 0, 0); + + newEffect->dispatchFunction (newEffect, plugInOpcodeOpen, 0, 0, 0, 0); + BusesProperties ioConfig = queryBusIO (newEffect); + newEffect->dispatchFunction (newEffect, plugInOpcodeClose, 0, 0, 0, 0); + + newEffect = constructEffect (newModule); + + if (newEffect != nullptr) + return new VSTPluginInstance (newModule, ioConfig, newEffect); + } + + return nullptr; + } + + //============================================================================== void fillInPluginDescription (PluginDescription& desc) const override { desc.name = name; @@ -665,9 +698,9 @@ public: desc.descriptiveName = name; } - desc.fileOrIdentifier = module->file.getFullPathName(); + desc.fileOrIdentifier = vstModule->file.getFullPathName(); desc.uid = getUID(); - desc.lastFileModTime = module->file.getLastModificationTime(); + desc.lastFileModTime = vstModule->file.getLastModificationTime(); desc.lastInfoUpdateTime = Time::getCurrentTime(); desc.pluginFormatName = "VST"; desc.category = getCategory(); @@ -681,14 +714,14 @@ public: desc.version = getVersion(); desc.numInputChannels = getTotalNumInputChannels(); desc.numOutputChannels = getTotalNumOutputChannels(); - desc.isInstrument = (effect != nullptr && (effect->flags & vstEffectFlagIsSynth) != 0); + desc.isInstrument = (vstEffect != nullptr && (vstEffect->flags & vstEffectFlagIsSynth) != 0); } bool initialiseEffect (double initialSampleRate, int initialBlockSize) { - if (effect != nullptr) + if (vstEffect != nullptr) { - effect->hostSpace2 = (pointer_sized_int) (pointer_sized_int) this; + vstEffect->hostSpace2 = (pointer_sized_int) (pointer_sized_int) this; initialise (initialSampleRate, initialBlockSize); return true; } @@ -698,7 +731,7 @@ public: void initialise (double initialSampleRate, int initialBlockSize) { - if (initialised || effect == nullptr) + if (initialised || vstEffect == nullptr) return; #if JUCE_WINDOWS @@ -709,11 +742,10 @@ public: jassert (MessageManager::getInstance()->isThisTheMessageThread()); #endif - JUCE_VST_LOG ("Initialising VST: " + module->pluginName + " (" + getVersion() + ")"); + JUCE_VST_LOG ("Initialising VST: " + vstModule->pluginName + " (" + getVersion() + ")"); initialised = true; - setPlayConfigDetails (effect->numInputChannels, effect->numOutputChannels, - initialSampleRate, initialBlockSize); + setRateAndBufferSizeDetails (initialSampleRate, initialBlockSize); dispatch (plugInOpcodeIdentify, 0, 0, 0, 0); @@ -725,16 +757,15 @@ public: dispatch (plugInOpcodeOpen, 0, 0, 0, 0); - setPlayConfigDetails (effect->numInputChannels, effect->numOutputChannels, - getSampleRate(), getBlockSize()); + setRateAndBufferSizeDetails (getSampleRate(), getBlockSize()); if (getNumPrograms() > 1) setCurrentProgram (0); else dispatch (plugInOpcodeSetCurrentProgram, 0, 0, 0, 0); - for (int i = effect->numInputChannels; --i >= 0;) dispatch (plugInOpcodeConnectInput, i, 1, 0, 0); - for (int i = effect->numOutputChannels; --i >= 0;) dispatch (plugInOpcodeConnectOutput, i, 1, 0, 0); + for (int i = vstEffect->numInputChannels; --i >= 0;) dispatch (plugInOpcodeConnectInput, i, 1, 0, 0); + for (int i = vstEffect->numOutputChannels; --i >= 0;) dispatch (plugInOpcodeConnectOutput, i, 1, 0, 0); if (getVstCategory() != kPlugCategShell) // (workaround for Waves 5 plugins which crash during this call) updateStoredProgramNames(); @@ -745,14 +776,14 @@ public: usesCocoaNSView = ((unsigned int) pluginCanDo ("hasCockosViewAsConfig") & 0xffff0000ul) == 0xbeef0000ul; #endif - setLatencySamples (effect->latency); + setLatencySamples (vstEffect->latency); } - void* getPlatformSpecificData() override { return effect; } + void* getPlatformSpecificData() override { return vstEffect; } const String getName() const override { - if (effect != nullptr) + if (vstEffect != nullptr) { char buffer[512] = { 0 }; @@ -770,17 +801,17 @@ public: int getUID() const { - int uid = effect != nullptr ? effect->plugInIdentifier : 0; + int uid = vstEffect != nullptr ? vstEffect->plugInIdentifier : 0; if (uid == 0) - uid = module->file.hashCode(); + uid = vstModule->file.hashCode(); return uid; } double getTailLengthSeconds() const override { - if (effect == nullptr) + if (vstEffect == nullptr) return 0.0; const double sampleRate = getSampleRate(); @@ -803,7 +834,14 @@ public: //============================================================================== void prepareToPlay (double rate, int samplesPerBlockExpected) override { - setPlayConfigDetails (effect->numInputChannels, effect->numOutputChannels, rate, samplesPerBlockExpected); + setRateAndBufferSizeDetails (rate, samplesPerBlockExpected); + + VstSpeakerConfiguration inArr, outArr; + + SpeakerMappings::channelSetToVstArrangement (getChannelLayoutOfBus (true, 0), inArr); + SpeakerMappings::channelSetToVstArrangement (getChannelLayoutOfBus (false, 0), outArr); + + dispatch (plugInOpcodeSetSpeakerConfiguration, 0, reinterpret_cast (&inArr), &outArr, 0.0f); vstHostTime.tempoBPM = 120.0; vstHostTime.timeSignatureNumerator = 4; @@ -835,14 +873,10 @@ public: int32 vstPrecision = isUsingDoublePrecision() ? vstProcessingSampleTypeDouble : vstProcessingSampleTypeFloat; - // if you get an assertion here then your plug-in claims it supports double precision - // but returns an error when we try to change the precision - pointer_sized_int err = dispatch (plugInOpcodeSetSampleFloatType, 0, (pointer_sized_int) vstPrecision, 0, 0); - jassert (err > 0); - ignoreUnused (err); + dispatch (plugInOpcodeSetSampleFloatType, 0, (pointer_sized_int) vstPrecision, 0, 0); } - tempBuffer.setSize (jmax (1, effect->numInputChannels), samplesPerBlockExpected); + tempBuffer.setSize (jmax (1, vstEffect->numInputChannels), samplesPerBlockExpected); if (! isPowerOn) setPower (true); @@ -857,7 +891,7 @@ public: dispatch (plugInOpcodeStartProcess, 0, 0, 0, 0); - setLatencySamples (effect->latency); + setLatencySamples (vstEffect->latency); } } @@ -898,15 +932,32 @@ public: bool supportsDoublePrecisionProcessing() const override { - return ((effect->flags & vstEffectFlagInplaceAudio) != 0 - && (effect->flags & vstEffectFlagInplaceDoubleAudio) != 0); + return ((vstEffect->flags & vstEffectFlagInplaceAudio) != 0 + && (vstEffect->flags & vstEffectFlagInplaceDoubleAudio) != 0); + } + + //============================================================================== + bool canAddBus (bool) const override { return false; } + bool canRemoveBus (bool) const override { return false; } + + bool isBusesLayoutSupported (const BusesLayout& layouts) const override + { + const int numInputBuses = getBusCount (true); + const int numOutputBuses = getBusCount (false); + + // it's not possible to change layout if there are sidechains/aux buses + if (numInputBuses > 1 || numOutputBuses > 1) + return (layouts == getBusesLayout()); + + return (layouts.getNumChannels (true, 0) <= vstEffect->numInputChannels + && layouts.getNumChannels (false, 0) <= vstEffect->numOutputChannels); } //============================================================================== #if JUCE_IOS bool hasEditor() const override { return false; } #else - bool hasEditor() const override { return effect != nullptr && (effect->flags & vstEffectFlagHasEditor) != 0; } + bool hasEditor() const override { return vstEffect != nullptr && (vstEffect->flags & vstEffectFlagHasEditor) != 0; } #endif AudioProcessorEditor* createEditor() override; @@ -967,14 +1018,14 @@ public: } //============================================================================== - int getNumParameters() override { return effect != nullptr ? effect->numParameters : 0; } + int getNumParameters() override { return vstEffect != nullptr ? vstEffect->numParameters : 0; } float getParameter (int index) override { - if (effect != nullptr && isPositiveAndBelow (index, (int) effect->numParameters)) + if (vstEffect != nullptr && isPositiveAndBelow (index, (int) vstEffect->numParameters)) { const ScopedLock sl (lock); - return effect->getParameterValueFunction (effect, index); + return vstEffect->getParameterValueFunction (vstEffect, index); } return 0.0f; @@ -982,12 +1033,12 @@ public: void setParameter (int index, float newValue) override { - if (effect != nullptr && isPositiveAndBelow (index, (int) effect->numParameters)) + if (vstEffect != nullptr && isPositiveAndBelow (index, (int) vstEffect->numParameters)) { const ScopedLock sl (lock); - if (effect->getParameterValueFunction (effect, index) != newValue) - effect->setParameterValueFunction (effect, index, newValue); + if (vstEffect->getParameterValueFunction (vstEffect, index) != newValue) + vstEffect->setParameterValueFunction (vstEffect, index, newValue); } } @@ -997,9 +1048,9 @@ public: bool isParameterAutomatable (int index) const override { - if (effect != nullptr) + if (vstEffect != nullptr) { - jassert (index >= 0 && index < effect->numParameters); + jassert (index >= 0 && index < vstEffect->numParameters); return dispatch (plugInOpcodeIsParameterAutomatable, index, 0, 0, 0) != 0; } @@ -1007,7 +1058,7 @@ public: } //============================================================================== - int getNumPrograms() override { return effect != nullptr ? jmax (0, effect->numPrograms) : 0; } + int getNumPrograms() override { return vstEffect != nullptr ? jmax (0, vstEffect->numPrograms) : 0; } // NB: some plugs return negative numbers from this function. int getCurrentProgram() override { return (int) dispatch (plugInOpcodeGetCurrentProgram, 0, 0, 0, 0); } @@ -1025,7 +1076,7 @@ public: if (index == getCurrentProgram()) return getCurrentProgramName(); - if (effect != nullptr) + if (vstEffect != nullptr) { char nm[264] = { 0 }; @@ -1118,7 +1169,7 @@ public: return 1; case hostOpcodeUpdateView: triggerAsyncUpdate(); break; - case hostOpcodeIOModified: setLatencySamples (effect->latency); break; + case hostOpcodeIOModified: setLatencySamples (vstEffect->latency); break; case hostOpcodeNeedsIdle: startTimer (50); break; case hostOpcodeGetSampleRate: return (pointer_sized_int) (getSampleRate() > 0 ? getSampleRate() : defaultVSTSampleRateValue); @@ -1233,7 +1284,7 @@ public: { pointer_sized_int result = 0; - if (effect != nullptr) + if (vstEffect != nullptr) { const ScopedLock sl (lock); const IdleCallRecursionPreventer icrp; @@ -1243,17 +1294,17 @@ public: #if JUCE_MAC const ResFileRefNum oldResFile = CurResFile(); - if (module->resFileId != 0) - UseResFile (module->resFileId); + if (vstModule->resFileId != 0) + UseResFile (vstModule->resFileId); #endif - result = effect->dispatchFunction (effect, opcode, index, value, ptr, opt); + result = vstEffect->dispatchFunction (vstEffect, opcode, index, value, ptr, opt); #if JUCE_MAC const ResFileRefNum newResFile = CurResFile(); if (newResFile != oldResFile) // avoid confusing the parent app's resource file with the plug-in's { - module->resFileId = newResFile; + vstModule->resFileId = newResFile; UseResFile (oldResFile); } #endif @@ -1449,7 +1500,7 @@ public: return true; } - bool usesChunks() const noexcept { return effect != nullptr && (effect->flags & vstEffectFlagDataInChunks) != 0; } + bool usesChunks() const noexcept { return vstEffect != nullptr && (vstEffect->flags & vstEffectFlagDataInChunks) != 0; } bool getChunkData (MemoryBlock& mb, bool isPreset, int maxSizeMB) const { @@ -1485,8 +1536,8 @@ public: return false; } - VstEffectInterface* effect; - ModuleHandle::Ptr module; + VstEffectInterface* vstEffect; + ModuleHandle::Ptr vstModule; ScopedPointer extraFunctions; bool usesCocoaNSView; @@ -1502,6 +1553,101 @@ private: VSTMidiEventList midiEventsToSend; VstTimingInformation vstHostTime; + //============================================================================== + static VstEffectInterface* constructEffect(const ModuleHandle::Ptr& module) + { + VstEffectInterface* effect = nullptr; + try + { + const IdleCallRecursionPreventer icrp; + _fpreset(); + + JUCE_VST_LOG ("Creating VST instance: " + module->pluginName); + + #if JUCE_MAC + if (module->resFileId != 0) + UseResFile (module->resFileId); + #endif + + { + JUCE_VST_WRAPPER_INVOKE_MAIN + } + + if (effect != nullptr && effect->interfaceIdentifier == juceVstInterfaceIdentifier) + { + jassert (effect->hostSpace2 == 0); + jassert (effect->effectPointer != 0); + + _fpreset(); // some dodgy plugs mess around with this + } + else + { + effect = nullptr; + } + } + catch (...) + {} + + return effect; + } + + static BusesProperties queryBusIO (VstEffectInterface* effect) + { + BusesProperties returnValue; + + VstSpeakerConfiguration* inArr = nullptr, *outArr = nullptr; + if (effect->dispatchFunction (effect, plugInOpcodeGetSpeakerArrangement, 0, reinterpret_cast (&inArr), &outArr, 0.0f) == 0) + inArr = outArr = nullptr; + + for (int dir = 0; dir < 2; ++dir) + { + const bool isInput = (dir == 0); + const int opcode = (isInput ? plugInOpcodeGetInputPinProperties : plugInOpcodeGetOutputPinProperties); + const int maxChannels = (isInput ? effect->numInputChannels : effect->numOutputChannels); + const VstSpeakerConfiguration* arr = (isInput ? inArr : outArr); + bool busAdded = false; + + VstPinInfo pinProps; + AudioChannelSet layout; + for (int ch = 0; ch < maxChannels; ch += layout.size()) + { + if (effect->dispatchFunction (effect, opcode, ch, 0, &pinProps, 0.0f) == 0) + break; + + if ((pinProps.flags & vstPinInfoFlagValid) != 0) + { + layout = SpeakerMappings::vstArrangementTypeToChannelSet (pinProps.configurationType, 0); + if (layout.isDisabled()) + break; + } + else + { + layout = ((pinProps.flags & vstPinInfoFlagIsStereo) != 0 ? AudioChannelSet::stereo() : AudioChannelSet::mono()); + } + + busAdded = true; + returnValue.addBus (isInput, pinProps.text, layout, true); + } + + // no buses? + if (! busAdded && maxChannels > 0) + { + String busName = (isInput ? "Input" : "Output"); + if (effect->dispatchFunction (effect, opcode, 0, 0, &pinProps, 0.0f) != 0) + busName = pinProps.text; + + if (arr != nullptr) + layout = SpeakerMappings::vstArrangementTypeToChannelSet (*arr); + else + layout = AudioChannelSet::canonicalChannelSet (maxChannels); + + returnValue.addBus (isInput, busName, layout, true); + } + } + + return returnValue; + } + //============================================================================== template void processAudio (AudioBuffer& buffer, MidiBuffer& midiMessages) @@ -1579,7 +1725,7 @@ private: jlimit (0, numSamples - 1, samplePosition)); } - effect->dispatchFunction (effect, plugInOpcodePreAudioProcessingEvents, 0, 0, midiEventsToSend.events, 0); + vstEffect->dispatchFunction (vstEffect, plugInOpcodePreAudioProcessingEvents, 0, 0, midiEventsToSend.events, 0); } _clearfp(); @@ -1605,25 +1751,25 @@ private: //============================================================================== inline void invokeProcessFunction (AudioBuffer& buffer, int32 sampleFrames) { - if ((effect->flags & vstEffectFlagInplaceAudio) != 0) + if ((vstEffect->flags & vstEffectFlagInplaceAudio) != 0) { - effect->processAudioInplaceFunction (effect, buffer.getArrayOfWritePointers(), buffer.getArrayOfWritePointers(), sampleFrames); + vstEffect->processAudioInplaceFunction (vstEffect, buffer.getArrayOfWritePointers(), buffer.getArrayOfWritePointers(), sampleFrames); } else { - tempBuffer.setSize (effect->numOutputChannels, sampleFrames); + tempBuffer.setSize (vstEffect->numOutputChannels, sampleFrames); tempBuffer.clear(); - effect->processAudioFunction (effect, buffer.getArrayOfWritePointers(), tempBuffer.getArrayOfWritePointers(), sampleFrames); + vstEffect->processAudioFunction (vstEffect, buffer.getArrayOfWritePointers(), tempBuffer.getArrayOfWritePointers(), sampleFrames); - for (int i = effect->numOutputChannels; --i >= 0;) + for (int i = vstEffect->numOutputChannels; --i >= 0;) buffer.copyFrom (i, 0, tempBuffer.getReadPointer (i), sampleFrames); } } inline void invokeProcessFunction (AudioBuffer& buffer, int32 sampleFrames) { - effect->processDoubleAudioInplaceFunction (effect, buffer.getArrayOfWritePointers(), buffer.getArrayOfWritePointers(), sampleFrames); + vstEffect->processDoubleAudioInplaceFunction (vstEffect, buffer.getArrayOfWritePointers(), buffer.getArrayOfWritePointers(), sampleFrames); } //============================================================================== @@ -1652,10 +1798,10 @@ private: String getTextForOpcode (const int index, const VstHostToPlugInOpcodes opcode) const { - if (effect == nullptr) + if (vstEffect == nullptr) return String(); - jassert (index >= 0 && index < effect->numParameters); + jassert (index >= 0 && index < vstEffect->numParameters); char nm[256] = { 0 }; dispatch (opcode, index, 0, nm, 0); return String::createStringFromData (nm, (int) sizeof (nm)).trim(); @@ -1665,7 +1811,7 @@ private: { String progName; - if (effect != nullptr) + if (vstEffect != nullptr) { { char nm[256] = { 0 }; @@ -1707,7 +1853,7 @@ private: void updateStoredProgramNames() { - if (effect != nullptr && getNumPrograms() > 0) + if (vstEffect != nullptr && getNumPrograms() > 0) { char nm[256] = { 0 }; @@ -1764,14 +1910,14 @@ private: pointer_sized_int getVstDirectory() const { #if JUCE_MAC - return (pointer_sized_int) (void*) &module->parentDirFSSpec; + return (pointer_sized_int) (void*) &vstModule->parentDirFSSpec; #else - return (pointer_sized_int) (pointer_sized_uint) module->fullParentDirectoryPathName.toRawUTF8(); + return (pointer_sized_int) (pointer_sized_uint) vstModule->fullParentDirectoryPathName.toRawUTF8(); #endif } //============================================================================== - int getVersionNumber() const noexcept { return effect != nullptr ? effect->plugInVersion : 0; } + int getVersionNumber() const noexcept { return vstEffect != nullptr ? vstEffect->plugInVersion : 0; } String getVersion() const { @@ -2623,8 +2769,8 @@ static VSTPluginInstance* createAndUpdateDesc (VSTPluginFormat& format, PluginDe if (VSTPluginInstance* instance = dynamic_cast (p)) { #if JUCE_MAC - if (instance->module->resFileId != 0) - UseResFile (instance->module->resFileId); + if (instance->vstModule->resFileId != 0) + UseResFile (instance->vstModule->resFileId); #endif instance->fillInPluginDescription (desc); @@ -2709,9 +2855,9 @@ void VSTPluginFormat::createPluginInstance (const PluginDescription& desc, { shellUIDToCreate = desc.uid; - result = new VSTPluginInstance (module); + result = VSTPluginInstance::create (module, sampleRate, blockSize); - if (! result->initialiseEffect (sampleRate, blockSize)) + if (result != nullptr && ! result->initialiseEffect (sampleRate, blockSize)) result = nullptr; } @@ -2829,8 +2975,8 @@ FileSearchPath VSTPluginFormat::getDefaultLocationsToSearch() const XmlElement* VSTPluginFormat::getVSTXML (AudioPluginInstance* plugin) { if (VSTPluginInstance* const vst = dynamic_cast (plugin)) - if (vst->module != nullptr) - return vst->module->vstXml.get(); + if (vst->vstModule != nullptr) + return vst->vstModule->vstXml.get(); return nullptr; } @@ -2874,9 +3020,9 @@ AudioPluginInstance* VSTPluginFormat::createCustomVSTFromMainCall (void* entryPo if (module->open()) { - ScopedPointer